From: John Spray <spray@lyx.org>
Date: Sat, 21 Jan 2006 20:48:26 +0000 (+0000)
Subject: GTK graphics dialog:  Default to scaling 100% when no scaling or size is given
X-Git-Tag: 1.6.10~13681
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b9963e1a57135c3e2ab128a9ec4300f0e4886992;p=features.git

GTK graphics dialog:  Default to scaling 100% when no scaling or size is given


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

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 52c558f66f..41aed98f36 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -5,6 +5,7 @@
 	* GDocument.[Ch], glade/document.glade: Add more functionality
 	  to the still-incomplete document dialog.
 	* Alert_pimpl.C: Make generic dialogs use the titles LyX gives them
+	* GGraphics.C: Default to scaling 100% when no scaling or size is given
 
 2006-01-20  Bernhard Reiter  <ockham@gmx.net>
 
diff --git a/src/frontends/gtk/GGraphics.C b/src/frontends/gtk/GGraphics.C
index 331ed43e30..3f5ea476e9 100644
--- a/src/frontends/gtk/GGraphics.C
+++ b/src/frontends/gtk/GGraphics.C
@@ -384,8 +384,11 @@ void GGraphics::update() {
 		&& !float_equal(convert<double>(igp.scale), 0.0, 0.05)) {
 		// scaling sizing mode
 		setscalingradio_->set_active(true);
-	} else {
+	} else if (!igp.width.empty() && !igp.height.empty()) {
 		setsizeradio_->set_active(true);
+	} else {
+		outputscalespin_->get_adjustment()->set_value(100.0);
+		setscalingradio_->set_active(true);
 	}
 	onSizingModeChange();