Changeset 224

Timestamp:

06/12/06 15:19:50 (2 years ago)

Author:

jordi

Message:

Modified the Zoom to Width and Zoom to Fit toggle button to stay toggled when they are being unchecked by the user (see bug #35.)

Location:

trunk/src

Files:

• Config.cxx (modified) (1 diff)
• MainPter.cxx (modified) (4 diffs)

trunk/src/Config.cxx

@@ -441 +441 @@
 Config::setZoomToWidth (gboolean activate)
 {
-    g_key_file_set_boolean (m_Values, "main window", "zoomToFit", 
+    g_key_file_set_boolean (m_Values, "main window", "zoomToFit",
             !activate && zoomToFit ());
     g_key_file_set_boolean (m_Values, "main window", "zoomToWidth", activate);

trunk/src/MainPter.cxx

@@ -647 +647 @@
 
     Config &config = Config::getConfig ();
-    config.setZoomToFit (active);
-    IMainView &view = getView ();
-    view.activeZoomFit (config.zoomToFit ());
-    view.activeZoomWidth (config.zoomToWidth ());
-    if ( active )
-    {
+    IMainView &view = getView ();
+    if ( active && !config.zoomToFit () )
+    {
+        config.setZoomToFit (TRUE);
+        view.activeZoomWidth (FALSE);
         zoomFit ();
+    }
+    else if ( config.zoomToFit () )
+    {
+        view.activeZoomFit (TRUE);
     }
 }
@@ -691 +694 @@
     view.activeZoomFit (FALSE);
     view.activeZoomWidth (FALSE);
-   
+
     m_Document->zoomOut ();
 }
@@ -713 +716 @@
 /// @brief The "Zoom Fit Width" was activated.
 ///
-/// @param active TRUE if the zoom to width option is activated, false otherwise.
+/// @param active TRUE if the zoom to width option is activated,
+///               FALSE otherwise.
 ///
 void
@@ -721 +725 @@
 
     Config &config = Config::getConfig ();
-    config.setZoomToWidth (active);
-    IMainView &view = getView ();
-    view.activeZoomFit (config.zoomToFit ());
-    view.activeZoomWidth (config.zoomToWidth ());
-    if ( active )
-    {
+    IMainView &view = getView ();
+    if ( active && !config.zoomToWidth () )
+    {
+        config.setZoomToWidth (TRUE);
+        view.activeZoomFit (FALSE);
+        view.activeZoomWidth (TRUE);
         zoomWidth ();
+    }
+    else if ( config.zoomToWidth () )
+    {
+        view.activeZoomWidth (TRUE);
     }
 }