Angus fix for resizing tabfolders on xforms 0.88.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4145 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 2018b1c223073fa08cd4852492236aafe74cde7c..f898bad23dad6ff27838b7e54294d1b6604f4c95 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-09  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * xforms_resize.h: improve the doc++ comments.
+
+       * xforms_resize.C (get_tabfolder_numfolders): new helper function,
+       wrapping fl_get_tabfolder_numfolders if it exists and otherwise
+       providing this info "somehow".
+       Constify a few variables.
+       whitespace changes.
+
 2002-05-06  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormBase.C (show):

diff --git a/src/frontends/xforms/xforms_resize.C b/src/frontends/xforms/xforms_resize.C
index e5816b82f466e04e94572a7d6c80860e6587d829..4f8b3efe0a3df64553d82573c46b1472e3a17252 100644 (file)
--- a/src/frontends/xforms/xforms_resize.C
+++ b/src/frontends/xforms/xforms_resize.C
@@ -58,10 +58,8 @@ double scale_to_fit_tabs(FL_FORM * form)
 
        for (; it != end; ++it) {
                folder = find_tabfolder(*it);
-               if (!folder)
-                       continue;
-               double folder_scale = scale_to_fit_tabs(folder);
-               scale = std::max(scale, folder_scale);
+               if (folder)
+                       scale = std::max(scale, scale_to_fit_tabs(folder));
        }
 
        return scale;
@@ -128,10 +126,10 @@ double scale_to_fit_tabs(FL_OBJECT * folder)
 
        // Ascertain the style parameters of the tabs.
        int label_style = FL_BOLD_STYLE;
-       int label_size  = FL_NORMAL_SIZE;
-       int box_width   = 1;
+       int label_size  = FL_NORMAL_SIZE;
+       int box_width   = 1;
        // Hard-coded within xforms' fl_create_tabfolder in tabfolder.c.
-       int const tab_padding =  12;
+       int const tab_padding = 12;
 
        for (FL_OBJECT * ob = parent->first; ob; ob = ob->next) {
                if (!ob->label)
@@ -146,7 +144,7 @@ double scale_to_fit_tabs(FL_OBJECT * folder)
 
                label_style = ob->lstyle;
                label_size  = ob->lsize;
-               
+
                if (ob->boxtype == FL_UP_BOX || ob->boxtype == FL_DOWN_BOX)
                        box_width = FL_abs(ob->bw);
 
@@ -177,11 +175,45 @@ double scale_to_fit_tabs(FL_OBJECT * folder)
        }
 
        // Compare this length to the width of the tabfolder
-       double scale = double(length) / double(folder->w);
+       double const scale = double(length) / double(folder->w);
        return std::max(double(1), scale);
 }
 
 
+// A nasty hack for older xforms versions
+int get_tabfolder_numfolders(FL_OBJECT * folder)
+{
+#if FL_REVISION > 88
+       return fl_get_tabfolder_numfolders(folder);
+#else
+       if (folder->objclass != FL_TABFOLDER)
+               return 0;
+
+       fl_freeze_form(folder->form);
+       int const saved_folder_id = fl_get_folder_number(folder);
+
+       int num_folders = 0;
+       FL_FORM const * old_leaf = 0;
+       for (;;) {
+               int const id = num_folders + 1;
+               fl_set_folder_bynumber(folder, id);
+               FL_FORM const * const leaf = fl_get_folder(folder);
+               if (!leaf || leaf == old_leaf) {
+                       // unable to increment succesfully.
+                       break;
+               }
+               old_leaf = leaf;
+               ++num_folders;
+       }
+
+       fl_set_folder_bynumber(folder, saved_folder_id);
+       fl_unfreeze_form(folder->form);
+
+       return num_folders;
+#endif
+}
+
+
 // Returns the leaves making up a tabfolder.
 vector<FL_FORM *> const leaves_in_tabfolder(FL_OBJECT * folder)
 {
@@ -189,9 +221,9 @@ vector<FL_FORM *> const leaves_in_tabfolder(FL_OBJECT * folder)
                return vector<FL_FORM *>();
 
        fl_freeze_form(folder->form);
-       int const folder_id = fl_get_folder_number(folder);
+       int const saved_folder_id = fl_get_folder_number(folder);
 
-       int const size = fl_get_tabfolder_numfolders(folder);
+       int const size = get_tabfolder_numfolders(folder);
        vector<FL_FORM *> leaves(size);
 
        for (int i = 0; i < size; ++i) {
@@ -199,7 +231,7 @@ vector<FL_FORM *> const leaves_in_tabfolder(FL_OBJECT * folder)
                leaves[i] = fl_get_folder(folder);
        }
 
-       fl_set_folder_bynumber(folder, folder_id);
+       fl_set_folder_bynumber(folder, saved_folder_id);
        fl_unfreeze_form(folder->form);
 
        return leaves;
@@ -213,20 +245,20 @@ vector<string> const tab_names(FL_OBJECT * folder)
                return vector<string>();
 
        fl_freeze_form(folder->form);
-       int const folder_id = fl_get_folder_number(folder);
+       int const saved_folder_id = fl_get_folder_number(folder);
 
-       int const size = fl_get_tabfolder_numfolders(folder);
+       int const size = get_tabfolder_numfolders(folder);
        vector<string> names(size);
 
        for (int i = 0; i < size; ++i) {
                fl_set_folder_bynumber(folder, i+1);
 
-               const char * const name = fl_get_folder_name(folder);
+               char const * const name = fl_get_folder_name(folder);
                if (name)
                        names[i] = name;
        }
 
-       fl_set_folder_bynumber(folder, folder_id);
+       fl_set_folder_bynumber(folder, saved_folder_id);
        fl_unfreeze_form(folder->form);
 
        return names;

diff --git a/src/frontends/xforms/xforms_resize.h b/src/frontends/xforms/xforms_resize.h
index 6174a61837b3b4cdfb4b0b01b43d8d8d3b6f239d..d5e7d9117d7fac4fd30a8b882ce04dbc0b71a7c6 100644 (file)
--- a/src/frontends/xforms/xforms_resize.h
+++ b/src/frontends/xforms/xforms_resize.h
@@ -16,17 +16,19 @@
 
 #include FORMS_H_LOCATION
 
-/** Returns 1 if the form does not contain a tabfolder.
-    If it does contain a tabfolder, then by how much should the form be
-    scaled to render the tabs (buttons) visible.
+/** If the form contains a tabfolder, then by how much should the form be
+    scaled (enlarged only) to render the tabs (buttons) visible?
 
-    This routine works for two levels of nested tabfolders.
+    Returns 1 if the form does not contain a tabfolder.
+
+    This routine works for two levels of nested tabfolders. (I.e., is sufficient
+    for our current needs.)
  */
 double scale_to_fit_tabs(FL_FORM * form);
 
 /** A wrapper for fl_scale_form(form, scale, 1) that scales the parent form
-    horizontally, but also scales the leaves (FL_FORMs) of the tabfolder,
-    should one exist.
+    horizontally, but also scales the leaves (FL_FORMs) of any nested
+    tabfolder, should one exist.
  */
 void scale_form(FL_FORM * form, double scale_factor);
 

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 8471c835795a3d404929cc98dc9517200dbb393f..9f6581e5f589afbcba43087a885e761c2177cefa 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -492,7 +492,7 @@ string const InsetERT::get_new_label() const
                la += inset.paragraph()->getChar(j);
                ++i;
        }
-       if (i > 0 && j < p_siz) {
+       if (inset.paragraph()->next() || (i > 0 && j < p_siz)) {
                la += "...";
        }
        if (la.empty()) {
@@ -709,3 +709,15 @@ int InsetERT::getMaxWidth(BufferView * bv, UpdatableInset const * in) const
                return -1;
        return w;
 }
+
+
+void InsetERT::update(BufferView * bv, LyXFont const & font,
+                      bool reinit)
+{
+       if (inset.need_update & InsetText::INIT ||
+               inset.need_update & InsetText::FULL)
+       {
+               setButtonLabel();
+       }
+       InsetCollapsable::update(bv, font, reinit);
+}

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 8f8c02d2824cfa3075b2e6d65138cf36ab7b182d..95a41dbf3c2de82d66d252661e4e84e2579fec8e 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -134,6 +134,8 @@ public:
        }
        ///
        int getMaxWidth(BufferView *, UpdatableInset const *) const;
+       ///
+       void update(BufferView *, LyXFont const &, bool =false);
 
 private:
        ///