From def443366ec0e0d1071106f13b94f2af50275a5d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 8 Feb 2002 08:30:09 +0000 Subject: [PATCH] Martin's patch to put \underleftarrow and \underrightarrow in the math panel git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3506 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/FormMathsDeco.C | 22 ++++++++++--------- src/frontends/xforms/form_maths_deco.C | 10 ++++----- src/frontends/xforms/forms/form_maths_deco.fd | 10 ++++----- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 873183118a..650d0b5eaf 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ + +2002-02-08 Martin Vermeer + + * FormMathsDeco.C: \underleftarrow and \underrightarrow + 2002-02-06 Angus Leeming Stabilise the tooltip interface and get Jürgen's patch to work ;-) diff --git a/src/frontends/xforms/FormMathsDeco.C b/src/frontends/xforms/FormMathsDeco.C index 4933589c7b..a5e4c36c1f 100644 --- a/src/frontends/xforms/FormMathsDeco.C +++ b/src/frontends/xforms/FormMathsDeco.C @@ -25,7 +25,7 @@ static char const * decoration_names[] = { "widehat", "widetilde", "overbrace", "overleftarrow", "overrightarrow", - "overline", "underbrace", "underline", + "overline", "underbrace", "underline", "underleftarrow", "underrightarrow", "hat", "acute", "bar", "dot", "check", "grave", "vec", "ddot", "breve", "tilde" @@ -52,9 +52,9 @@ void FormMathsDeco::build() { dialog_.reset(build_maths_deco()); - fl_set_bmtable_data(dialog_->bmtable_deco1, 3, 3, + fl_set_bmtable_data(dialog_->bmtable_deco1, 3, 4, deco1_width, deco1_height, deco1_bits); - fl_set_bmtable_maxitems(dialog_->bmtable_deco1, 8); + fl_set_bmtable_maxitems(dialog_->bmtable_deco1, 10); fl_set_bmtable_data(dialog_->bmtable_deco2, 4, 3, deco2_width, deco2_height, deco2_bits); @@ -68,18 +68,20 @@ void FormMathsDeco::build() void FormMathsDeco::apply() { - if (deco_ >= nr_decoration_names) - return; - - parent_.insertSymbol(decoration_names[deco_]); + if (deco_ < nr_decoration_names) + parent_.insertSymbol(decoration_names[deco_]); } + bool FormMathsDeco::input(FL_OBJECT * ob, long) { deco_ = fl_get_bmtable(ob); - if (deco_ < 0) return false; - //if (ob == dialog_->bmtable_deco1) deco_ += 0; - if (ob == dialog_->bmtable_deco2) deco_ += 8; + if (deco_ < 0) + return false; + //if (ob == dialog_->bmtable_deco1) + // deco_ += 0; + if (ob == dialog_->bmtable_deco2) + deco_ += 10; apply(); return true; } diff --git a/src/frontends/xforms/form_maths_deco.C b/src/frontends/xforms/form_maths_deco.C index 84022115c0..3914184128 100644 --- a/src/frontends/xforms/form_maths_deco.C +++ b/src/frontends/xforms/form_maths_deco.C @@ -23,16 +23,16 @@ FD_form_maths_deco * FormMathsDeco::build_maths_deco() FL_OBJECT *obj; FD_form_maths_deco *fdui = new FD_form_maths_deco; - fdui->form = fl_bgn_form(FL_NO_BOX, 160, 257); + fdui->form = fl_bgn_form(FL_NO_BOX, 160, 295); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 160, 257, ""); - fdui->bmtable_deco1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 10, 10, 140, 90, ""); + obj = fl_add_box(FL_UP_BOX, 0, 0, 160, 295, ""); + fdui->bmtable_deco1 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 10, 10, 140, 120, ""); fl_set_object_lcolor(obj, FL_BLUE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 28, 214, 100, 30, _("Close")); + fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 30, 250, 100, 30, _("Close")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0); - fdui->bmtable_deco2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 20, 110, 120, 90, ""); + fdui->bmtable_deco2 = obj = fl_add_bmtable(FL_PUSH_BUTTON, 20, 140, 120, 90, ""); fl_set_object_lcolor(obj, FL_BLUE); fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0); fl_end_form(); diff --git a/src/frontends/xforms/forms/form_maths_deco.fd b/src/frontends/xforms/forms/form_maths_deco.fd index 75a549af8e..8cf16f256f 100644 --- a/src/frontends/xforms/forms/form_maths_deco.fd +++ b/src/frontends/xforms/forms/form_maths_deco.fd @@ -10,13 +10,13 @@ SnapGrid: 2 =============== FORM =============== Name: form_maths_deco Width: 160 -Height: 257 +Height: 295 Number of Objects: 4 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 160 257 +box: 0 0 160 295 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -34,7 +34,7 @@ argument: -------------------- class: FL_BUTTON type: PUSH_BUTTON -box: 10 10 140 90 +box: 10 10 140 120 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -52,7 +52,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 28 214 100 30 +box: 30 250 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -70,7 +70,7 @@ argument: 0 -------------------- class: FL_BUTTON type: PUSH_BUTTON -box: 20 110 120 90 +box: 20 140 120 90 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER -- 2.39.5