X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbclistbox.h;h=e0654105acf39b007dae887f99372a3d8723c5a9;hb=7b05ad287956f8bd00836d9b5fb39f899a5fb641;hp=e815a7f7edd1935616c4f4d5efb5096116f480b0;hpb=25bafacda1fe9d8a9520cad451547a75d934c1bb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bclistbox.h b/cinelerra-5.1/guicast/bclistbox.h
index e815a7f7..e0654105 100644
--- a/cinelerra-5.1/guicast/bclistbox.h
+++ b/cinelerra-5.1/guicast/bclistbox.h
@@ -32,43 +32,36 @@
 #define BCPOPUPLISTBOX_W 25
 #define BCPOPUPLISTBOX_H 25
 
+class BC_ListBoxYScroll;
+class BC_ListBoxXScroll;
+class BC_ListBoxToggle;
+class BC_ListBox;
 
 #define MIN_COLUMN_WIDTH 10
 
 
 class BC_ListBoxYScroll : public BC_ScrollBar
 {
+	BC_ListBox *listbox;
 public:
-	BC_ListBoxYScroll(BC_ListBox *listbox,
-	                  int total_height,
-					  int view_height,
-	                  int position);
+	BC_ListBoxYScroll(BC_ListBox *listbox);
 	~BC_ListBoxYScroll();
 	int handle_event();
-private:
-	BC_ListBox *listbox;
 };
 
 class BC_ListBoxXScroll : public BC_ScrollBar
 {
+	BC_ListBox *listbox;
 public:
-	BC_ListBoxXScroll(BC_ListBox *listbox,
-	                  int total_width,
-					  int view_width,
-	                  int position);
+	BC_ListBoxXScroll(BC_ListBox *listbox);
 	~BC_ListBoxXScroll();
 	int handle_event();
-private:
-	BC_ListBox *listbox;
 };
 
 class BC_ListBoxToggle
 {
 public:
-	BC_ListBoxToggle(BC_ListBox *listbox,
-		BC_ListBoxItem *item,
-		int x,
-		int y);
+	BC_ListBoxToggle(BC_ListBox *listbox, BC_ListBoxItem *item, int x, int y);
 
 	int cursor_motion_event(int *redraw_toggles);
 	int cursor_leave_event(int *redraw_toggles);
@@ -96,11 +89,11 @@ public:
 
 class BC_ListBox : public BC_SubWindow
 {
+	friend class BC_ListBoxYScroll;
+	friend class BC_ListBoxXScroll;
+	friend class BC_ListBoxToggle;
 public:
-	BC_ListBox(int x,
-		int y,
-		int w,
-		int h,
+	BC_ListBox(int x, int y, int w, int h,
 		int display_format,                   // Display text list or icons
 		ArrayList<BC_ListBoxItem*> *data = 0, // Each column has an ArrayList of BC_ListBoxItems.
 		const char **column_titles = 0,             // Titles for columns.  Set to 0 for no titles
@@ -113,8 +106,6 @@ public:
 		int allow_drag = 0);                  // Allow user to drag icons around
 	virtual ~BC_ListBox();
 
-	friend class BC_ListBoxToggle;
-
 	int initialize();
 
 // User event handler for new selections
@@ -210,14 +201,11 @@ public:
 
 // change the contents
 	int update(ArrayList<BC_ListBoxItem*> *data,
-						const char **column_titles,
-						int *column_widths,
-						int columns,
-						int xposition = 0,
-						int yposition = 0,
-						int highlighted_number = -1,  // Flat index of item cursor is over
-						int recalc_positions = 0,     // set all autoplace flags to 1
-						int draw = 1);
+		const char **column_titles, int *column_widths, int columns,
+		int xposition = 0, int yposition = 0,
+		int highlighted_number = -1,  // Flat index of item cursor is over
+		int recalc_positions = 0,     // set all autoplace flags to 1
+		int draw = 1);
 	void center_selection();
 	void update_format(int display_format, int redraw);
 	int get_format();
@@ -246,6 +234,7 @@ public:
 	int get_xscroll_x();
 	int get_xscroll_y();
 	int get_xscroll_width();
+	void set_scroll_stretch(int xv, int yv);
 	int get_column_offset(int column);
 	int get_column_width(int column, int clamp_right = 0);
 	int get_title_h();
@@ -253,6 +242,9 @@ public:
 	void set_justify(int value);
 	int get_w() { return is_popup ? BCPOPUPLISTBOX_W : popup_w; }
 	int get_h() { return is_popup ? BCPOPUPLISTBOX_H : popup_h; }
+	int gui_tooltip(const char *text) {
+		return is_popup && gui ? gui->show_tooltip(text, gui->get_w(),0, -1,-1) : -1;
+	}
 	int get_view_w() { return view_w; }
 	int get_view_h() { return view_h; }
 	int get_row_height() { return row_height; }
@@ -261,7 +253,6 @@ public:
 	int get_first_visible() { return first_in_view; }
 	int get_last_visible() { return last_in_view; }
 
-
 	enum
 	{
 		SORT_ASCENDING,
@@ -275,6 +266,9 @@ public:
 
 
 	void reset_query();
+	int get_show_query() { return show_query; }
+	void set_show_query(int v) { show_query = v; }
+
 	int reposition_window(int x,
 		int y,
 		int w = -1,
@@ -503,7 +497,7 @@ private:
 	BC_ListBoxYScroll *yscrollbar;
 	ArrayList<BC_ListBoxToggle*> expanders;
 	char query[BCTEXTLEN];
-
+	int show_query;
 
 // Window containing the listbox
 	BC_WindowBase *gui;
@@ -525,6 +519,7 @@ private:
 // In BCLISTBOX_SELECT mode determines the value to set items to
 	int new_value;
 	int need_xscroll, need_yscroll;
+	int xscroll_orientation, yscroll_orientation;
 // Move items during drag operation of text items.
 	int process_drag;
 	int allow_drag;
@@ -534,7 +529,6 @@ private:
 	int list_background;
 
 
-
 // Popup button
 	BC_Pixmap *button_images[4];
 // Expander