Fix class switching bug

[lyx.git] / src / combox.C

diff --git a/src/combox.C b/src/combox.C
index 3f57d01d127adfcf64657b80affb3be72204800b..9fad5bcb35e32b4d909062454d42efe7ccbc80d7 100644 (file)
--- a/src/combox.C
+++ b/src/combox.C
@@ -49,7 +49,7 @@ extern "C" void C_Combox_combo_cb(FL_OBJECT *ob, long data) ;
 extern "C" int C_Combox_peek_event(FL_FORM * form, void *xev);
 
 Combox::Combox(combox_type t)
-       : type(t)
+       : type(t), tabfolder1(0), tabfolder2(0)
 {
    browser = button = 0;
    callback = 0;
@@ -142,7 +142,7 @@ bool Combox::select_text(string const & t)
 }
 
 
-void Combox::select(size_t i)
+void Combox::select(int i)
 {
        if (!browser || !button) return;
        if (i > 0 && i <= fl_get_browser_maxline(browser)) sel = i; 
@@ -156,11 +156,16 @@ void Combox::select(size_t i)
 }
 
 
-void Combox::add(int x, int y, int w, int hmin, int hmax)
-{  
+void Combox::add(int x, int y, int w, int hmin, int hmax,
+                FL_OBJECT * tabfolder1_, FL_OBJECT * tabfolder2_)
+{
+       // Store these for later use in working round an xforms bug in Show()
+       tabfolder1 = tabfolder1_;
+       tabfolder2 = tabfolder2_;
+
        FL_OBJECT * obj;
        
-       switch(type) {
+       switch (type) {
        case FL_COMBOX_DROPLIST:
        {
                button = obj = fl_add_button(FL_NORMAL_BUTTON,
@@ -253,8 +258,38 @@ void Combox::Show()
                fl_set_object_label(button, "@2<-");          
                fl_redraw_object(button);
        }
-       int x = label->form->x + label->x, y = label->form->y + label->y;
-       fl_set_form_position(form, x, y + label->h);
+
+       int x = label->x;
+       int y = label->y + label->h;
+       if (tabfolder1) {
+               // This is a bug work around suggested by Steve Lamont on the
+               // xforms mailing list. It correctly positions the browser form
+               // after the main window has been moved.
+               // The bug only occurs in tabbed folders.
+               int folder_x, folder_y, folder_w, folder_h;
+               fl_get_folder_area( tabfolder1,
+                                   &folder_x, &folder_y,
+                                   &folder_w, &folder_h );
+               x += folder_x;
+               y += folder_y;
+
+               if (tabfolder2) {
+                       fl_get_folder_area( tabfolder2,
+                                           &folder_x, &folder_y,
+                                           &folder_w, &folder_h );
+                       x += tabfolder2->form->x + folder_x;
+                       y += tabfolder2->form->y + folder_y;
+               } else {
+                       x += tabfolder1->form->x;
+                       y += tabfolder1->form->y;
+               }
+               
+       } else {
+               x += label->form->x;
+               y += label->form->y;
+       }
+
+       fl_set_form_position(form, x, y);
        fl_show_form(form, FL_PLACE_POSITION, FL_NOBORDER, "");
         if (sel>0) {
                fl_set_browser_topline(browser, sel);
@@ -321,7 +356,7 @@ void Combox::input_cb(FL_OBJECT * ob, long)
 
        char const * text = fl_get_input(ob);
 
-       combo->addto(text ? text : string());
+       combo->addto(text ? string(text) : string());
        combo->is_empty = false;
 }
 
@@ -391,10 +426,9 @@ int Combox::peek_event(FL_FORM * form, void * xev)
        if (static_cast<XEvent*>(xev)->type != KeyPress) return 0;
        
        char s_r[10]; s_r[9] = '\0';
-       static int num_bytes;
        KeySym keysym_return;
-       num_bytes = XLookupString(&static_cast<XEvent*>(xev)->xkey, s_r, 10, 
-                                 &keysym_return, 0);
+       XLookupString(&static_cast<XEvent*>(xev)->xkey, s_r, 10, 
+                             &keysym_return, 0);
        XFlush(fl_get_display());
        switch (keysym_return) {
        case XK_Down: