Fixed vertical lock at initial load and subpixel coordinate display.

dov · Jan 10, 2014 · c6ac4d1 · c6ac4d1
1 parent f0a9b47
commit c6ac4d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/giv-win.gob b/src/giv-win.gob
@@ -2030,9 +2030,9 @@ cb_motion_event(GtkWidget *widget,
             do_update_label = false;
     }
     else if (selfp->do_show_sub_pixel)
-         g_string_sprintf(info_label, " (%7.3f, %7.3f)", x, y);
+        g_string_sprintf(info_label, " (%7.3f, %7.3f)", x, y);
     else
-         g_string_sprintf(info_label, " (%4.0f, %4.0f)", x, y);
+        g_string_sprintf(info_label, " (%4.0f, %4.0f)", floor(x), floor(y));
 
     if (do_update_measure_distance) {
         double m_dist = sqrt(sqr(selfp->measure_x2 - selfp->measure_x1)

diff --git a/src/giv.cc b/src/giv.cc
@@ -13,8 +13,6 @@
 
 #define CASE(s) if (!strcmp(s, S_))
 
-//extern "C" unsigned int __cdecl _get_output_format( void ){ return 0; }
-
 int main(int argc, char **argv)
 {
     GtkWidget *giv;

diff --git a/src/gtkimageviewer/gtk-image-viewer.gob b/src/gtkimageviewer/gtk-image-viewer.gob
@@ -1860,7 +1860,7 @@ class Gtk:Image:Viewer from Gtk:Widget
                                  selfp->scroll_max_x,
                                  selfp->scroll_max_y,
                                  margin,
-                                 selfp->do_vertical_lock);
+                                 !selfp->do_vertical_lock);
   }
 
   // Signals