From: Angus Leeming <leeming@lyx.org>
Date: Thu, 31 Oct 2002 11:25:02 +0000 (+0000)
Subject: Use lyx::float_equal with floats.
X-Git-Tag: 1.6.10~18043
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6de5387b91e4cfec752e5a4cc18df6a94d640b37;p=features.git

Use lyx::float_equal with floats.


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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index a9d0db9a9c..b05c6bb7d8 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -2,6 +2,8 @@
 
 	* xformsImage.C (clip): fix crash caused by uint -> int nastiness.
 
+	* FormGraphics.C: use lyx::float_equal.
+
 2002-10-29  Rob Lahaye  <lahaye@snu.ac.kr>
 
 	* FormParagraph.[Ch]:
diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index ba500569d2..a87b169a32 100644
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -111,10 +111,10 @@ void FormGraphics::build()
 	fl_set_input_return(file_->input_height, FL_RETURN_CHANGED);
 
 	fl_set_input_maxchars(file_->input_filename, FILENAME_MAXCHARS);
-	fl_set_input_filter(file_->input_lyxscale, fl_unsigned_float_filter);
+	fl_set_input_filter(file_->input_lyxscale, fl_unsigned_int_filter);
 
-	// width default is scaling, thus unsigned integer input
-	fl_set_input_filter(file_->input_width, fl_unsigned_int_filter);
+	// width default is scaling: use unsigned float filter
+	fl_set_input_filter(file_->input_width, fl_unsigned_float_filter);
 	fl_set_input_maxchars(file_->input_height, SIZE_MAXDIGITS);
 	
 	string const display_List =
@@ -433,7 +433,7 @@ void FormGraphics::update() {
 	}
 
 	// set width input fields according to scaling or width/height input
-	if (igp.scale) {
+	if (!lyx::float_equal(igp.scale, 0.0, 0.05)) {
 		fl_set_input_filter(file_->input_width, fl_unsigned_float_filter);
 		fl_set_input_maxchars(file_->input_width, 0);
 		fl_set_input(file_->input_width, tostr(igp.scale).c_str());
@@ -449,7 +449,7 @@ void FormGraphics::update() {
 				igp.height, defaultUnit);
 
 	// disable height input in case of scaling
-	bool const disable_height = igp.scale != 0.0;
+	bool const disable_height = !lyx::float_equal(igp.scale, 0.0, 0.05);
 	setEnabled(file_->input_height, !disable_height);
 	setEnabled(file_->choice_height, !disable_height);
 	
@@ -582,7 +582,7 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 		
 		// allow only integer intput for scaling; float otherwise
 		if (scaling) {
-			fl_set_input_filter(file_->input_width, fl_unsigned_int_filter);
+			fl_set_input_filter(file_->input_width, fl_unsigned_float_filter);
 			fl_set_input_maxchars(file_->input_width, 0);
 		} else {
 			fl_set_input_filter(file_->input_width, NULL);