(Rob Lahaye): prettify a couple of dialogs; use float_equal.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index b5d6a97233ac8cc877c25854d5e46a2bdc7b4874..20e70bc06f295d294ac029c7fd36c9f5bc16ada2 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-27 Rob Lahaye  <lahaye@snu.ac.kr>
+
+       * xformsImage.C: use lyx::float_equal() for comparing floats & doubles
+
 2003-02-21  Angus Leeming  <leeming@lyx.org>
 
        * FormDialogView.[Ch]: new base class for the xforms dialogs,
@@ -6,7 +10,7 @@
 
        * Dialogs_impl.h:
        * Dialogs.C:
-       * Dilaogs2.C: strip out those dialogs that now use the new
+       * Dialogs2.C: strip out those dialogs that now use the new
        Dialog class as the platform for an MCV split.
 
        * Dialogs3.C: new file. Lazy instantiation of those dialogs that

diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd
index 90a82c2b59fa6490342d8d9d8743af1a445e9932..f7e7b3750bd5bc4da9f9eac2bfef3093645918b8 100644 (file)
--- a/src/frontends/xforms/forms/form_external.fd
+++ b/src/frontends/xforms/forms/form_external.fd
@@ -5,18 +5,19 @@ Internal Form Definition File
 
 Number of forms: 1
 Unit of measure: FL_COORD_PIXEL
+SnapGrid: 5
 
 =============== FORM ===============
 Name: form_external
-Width: 560
-Height: 310
+Width: 320
+Height: 355
 Number of Objects: 12
 
 --------------------
 class: FL_BOX
-type: UP_BOX
-box: 0 0 560 310
-boxtype: FL_UP_BOX
+type: FLAT_BOX
+box: 0 0 320 355
+boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
@@ -33,7 +34,7 @@ argument:
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 130 10 300 30
+box: 110 5 160 25
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_RIGHT_BCOL
 alignment: FL_ALIGN_LEFT
@@ -51,7 +52,7 @@ argument: 0
 --------------------
 class: FL_BROWSER
 type: NORMAL_BROWSER
-box: 130 50 300 130
+box: 5 35 310 125
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_TOP
@@ -69,10 +70,10 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 130 190 190 30
+box: 5 220 310 25
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
@@ -87,7 +88,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 330 190 100 30
+box: 215 245 100 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -105,10 +106,10 @@ argument: 0
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 130 230 300 30
+box: 5 290 310 25
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
@@ -123,7 +124,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 435 50 110 30
+box: 5 165 100 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -132,8 +133,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Edit file|#E
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NorthEast FL_NorthEast
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
 name: button_edit
 callback: C_FormBaseInputCB
 argument: 0
@@ -141,7 +142,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 435 90 110 30
+box: 110 165 100 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -150,8 +151,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: View result|#V
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NorthEast FL_NorthEast
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
 name: button_view
 callback: C_FormBaseInputCB
 argument: 0
@@ -159,7 +160,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 435 130 110 30
+box: 215 165 100 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -168,8 +169,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Update result|#U
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NorthEast FL_NorthEast
+resize: FL_RESIZE_NONE
+gravity: FL_SouthEast FL_SouthEast
 name: button_update
 callback: C_FormBaseInputCB
 argument: 0
@@ -177,7 +178,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: RETURN_BUTTON
-box: 255 270 90 30
+box: 35 325 90 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -195,7 +196,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 355 270 90 30
+box: 130 325 90 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -213,7 +214,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 455 270 90 30
+box: 225 325 90 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER

diff --git a/src/frontends/xforms/forms/form_forks.fd b/src/frontends/xforms/forms/form_forks.fd
index 7eeda5193aa76f41bfedf0fa960b7032e75bb4a1..c93f13291a6e6a7f9b2254fdb6c84d368aea7c70 100644 (file)
--- a/src/frontends/xforms/forms/form_forks.fd
+++ b/src/frontends/xforms/forms/form_forks.fd
@@ -5,22 +5,23 @@ Internal Form Definition File
 
 Number of forms: 1
 Unit of measure: FL_COORD_PIXEL
+SnapGrid: 5
 
 =============== FORM ===============
 Name: form_forks
-Width: 650
-Height: 390
+Width: 535
+Height: 200
 Number of Objects: 9
 
 --------------------
 class: FL_BOX
-type: UP_BOX
-box: 0 0 650 390
-boxtype: FL_UP_BOX
+type: FLAT_BOX
+box: 0 0 535 200
+boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
@@ -33,7 +34,7 @@ argument:
 --------------------
 class: FL_BROWSER
 type: HOLD_BROWSER
-box: 20 30 400 290
+box: 5 20 330 140
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_TOP
@@ -43,7 +44,7 @@ lcol: FL_BLACK
 label: Forked child processes:|#F
 shortcut: 
 resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_NorthWest FL_South
 name: browser_children
 callback: C_FormBaseInputCB
 argument: 0
@@ -51,7 +52,7 @@ argument: 0
 --------------------
 class: FL_BROWSER
 type: HOLD_BROWSER
-box: 510 30 125 290
+box: 410 20 120 140
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_TOP
@@ -61,7 +62,7 @@ lcol: FL_BLACK
 label: Kill processes:|#K
 shortcut: 
 resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+gravity: FL_North FL_SouthEast
 name: browser_kill
 callback: C_FormBaseInputCB
 argument: 0
@@ -69,7 +70,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 432 30 65 30
+box: 340 25 65 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -78,8 +79,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: All ->
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_North FL_North
 name: button_all
 callback: C_FormBaseInputCB
 argument: 0
@@ -87,7 +88,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 450 70 30 30
+box: 360 55 25 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -96,8 +97,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: @->
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_North FL_North
 name: button_add
 callback: C_FormBaseInputCB
 argument: 0
@@ -105,7 +106,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 450 110 30 30
+box: 360 85 25 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -114,8 +115,8 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: @4->
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
+resize: FL_RESIZE_NONE
+gravity: FL_North FL_North
 name: button_remove
 callback: C_FormBaseInputCB
 argument: 0
@@ -123,7 +124,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: RETURN_BUTTON
-box: 355 350 90 30
+box: 250 170 90 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -132,7 +133,7 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: OK
 shortcut: ^M
-resize: FL_RESIZE_ALL
+resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: button_ok
 callback: C_FormBaseOKCB
@@ -141,7 +142,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 450 350 90 30
+box: 345 170 90 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -150,7 +151,7 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Apply|#A
 shortcut: 
-resize: FL_RESIZE_ALL
+resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: button_apply
 callback: C_FormBaseApplyCB
@@ -159,7 +160,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 545 350 90 30
+box: 440 170 90 25
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -168,7 +169,7 @@ size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Close|^[
 shortcut: 
-resize: FL_RESIZE_ALL
+resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: button_close
 callback: C_FormBaseCancelCB

diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C
index 8f7139c3a519cdce5803cfd3aa60e9d72f77b6d0..5af697e469edde87c47c931351e4c93dab12665a 100644 (file)
--- a/src/frontends/xforms/xformsImage.C
+++ b/src/frontends/xforms/xformsImage.C
@@ -296,7 +296,7 @@ void xformsImage::rotate(Params const & params)
        if (!image_)
                return ;
 
-       if (!params.angle)
+       if (lyx::float_equal(params.angle, 0.0, 0.1))
                // No rotation is necessary.
                return;
 
@@ -306,7 +306,7 @@ void xformsImage::rotate(Params const & params)
        // Work around xforms bug when params.angle == 270
        // the 'InternalError: bad special angle' error.
        // This bug fix is not needed in xforms 1.0 and greater.
-       if (params.angle == 270) {
+       if (lyx::float_equal(params.angle, 270.0, 0.1)) {
                flimage_rotate(image_,  900, FLIMAGE_SUBPIXEL);
                flimage_rotate(image_, 1800, FLIMAGE_SUBPIXEL);
        } else {