add one fractional digit to zooms less than 10%

[inkscape.git] / src / widgets / desktop-widget.cpp

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index cdfac93f1f6f6086f145b3c3e949ca612af39db3..51355b3e516af91c7e1557ff34fe7837840d5926 100644 (file)
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1023,9 +1023,11 @@ sp_desktop_widget_layout (SPDesktopWidget *dtw)
     if (prefs_get_int_attribute (fullscreen ? "fullscreen.scrollbars" : "window.scrollbars", "state", 1) == 0) {
         gtk_widget_hide_all (dtw->hscrollbar);
         gtk_widget_hide_all (dtw->vscrollbar_box);
+        gtk_widget_hide_all( dtw->cms_adjust );
     } else {
         gtk_widget_show_all (dtw->hscrollbar);
         gtk_widget_show_all (dtw->vscrollbar_box);
+        gtk_widget_show_all( dtw->cms_adjust );
     }
 
     if (prefs_get_int_attribute (fullscreen ? "fullscreen.rulers" : "window.rulers", "state", 1) == 0) {
@@ -1200,7 +1202,7 @@ bool SPDesktopWidget::onFocusInEvent(GdkEventFocus*)
 static gdouble
 sp_dtw_zoom_value_to_display (gdouble value)
 {
-    return floor (pow (2, value) * 100.0 + 0.5);
+    return floor (10 * (pow (2, value) * 100.0 + 0.05)) / 10;
 }
 
 static gdouble
@@ -1229,7 +1231,12 @@ static bool
 sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data)
 {
     gchar b[64];
-    g_snprintf (b, 64, "%4.0f%%", sp_dtw_zoom_value_to_display (gtk_spin_button_get_value (spin)));
+    double val = sp_dtw_zoom_value_to_display (gtk_spin_button_get_value (spin));
+    if (val < 10) {
+        g_snprintf (b, 64, "%4.1f%%", val);
+    } else {
+        g_snprintf (b, 64, "%4.0f%%", val);
+    }
     gtk_entry_set_text (GTK_ENTRY (spin), b);
     return TRUE;
 }
@@ -1370,10 +1377,12 @@ sp_desktop_widget_toggle_scrollbars (SPDesktopWidget *dtw)
     if (GTK_WIDGET_VISIBLE (dtw->hscrollbar)) {
         gtk_widget_hide_all (dtw->hscrollbar);
         gtk_widget_hide_all (dtw->vscrollbar_box);
+        gtk_widget_hide_all( dtw->cms_adjust );
         prefs_set_int_attribute (dtw->desktop->is_fullscreen() ? "fullscreen.scrollbars" : "window.scrollbars", "state", 0);
     } else {
         gtk_widget_show_all (dtw->hscrollbar);
         gtk_widget_show_all (dtw->vscrollbar_box);
+        gtk_widget_show_all( dtw->cms_adjust );
         prefs_set_int_attribute (dtw->desktop->is_fullscreen() ? "fullscreen.scrollbars" : "window.scrollbars", "state", 1);
     }
 }