improve reveal handling for props

needs to change value immediately, not at the end of animate

Author: jcupitt

README.md

@@ -237,12 +237,13 @@ then check the build status here:
 
 ## TODO
 
-- save and restore properties setting and properties position
-  
-    seems a bit buggy right now
-
 - prop position should be distance from right edge, not left edge
 
+    and improve the default position ... should be the width of the 
+    properties widget
+
+- on props hide, force kb focus to iamgedisplay
+
 - use eg. alt-left, alt-right to flip between images in "vipsdisp a.jpg b.jpg"
   or maybe shift-<, shift->? 
 

src/animatedpane.c

@@ -21,14 +21,11 @@ struct _Animatedpane
 
 	GtkWidget *paned;
 
+	// the state we expose via properties
 	gboolean revealed;
-
-	/* Saved position of the GtkPaned separator.
-	 */
 	int position;
 
-	/* Animation state.
-	 */
+	// animation state.
 	double elapsed;
 	double last_frame_time;
 	gboolean is_animating;
@@ -124,13 +121,23 @@ animatedpaned_set_child_position( Animatedpane *animatedpane, int position )
 	gtk_paned_set_position( GTK_PANED( animatedpane->paned ), position );
 }
 
+/* From clutter-easing.c, based on Robert Penner's infamous easing equations,
+ * MIT license.
+ */
+static double
+ease_out_cubic( double t )
+{
+	double p = t - 1;
+
+	return( p * p * p + 1 );
+}
+
 static gboolean
 animatedpane_animate_tick( GtkWidget *widget, GdkFrameClock *frame_clock,
     gpointer client_data )
 {
 	Animatedpane *animatedpane = ANIMATEDPANE( widget );
     gint64 frame_time = gdk_frame_clock_get_frame_time( frame_clock );
-	gboolean revealed = GPOINTER_TO_INT( client_data );
 
 	double t;
 
@@ -151,8 +158,8 @@ animatedpane_animate_tick( GtkWidget *widget, GdkFrameClock *frame_clock,
 	if( t >= 0.99 ) {
 		// all done
 		animatedpaned_set_child_position( animatedpane, animatedpane->stop );
-		animatedpaned_set_child_visibility( animatedpane, revealed );
-		animatedpane->revealed = revealed;
+		if( !animatedpane->revealed )
+			animatedpaned_set_child_visibility( animatedpane, FALSE );
 		animatedpane->is_animating = FALSE;
 
 		return( G_SOURCE_REMOVE );
@@ -175,6 +182,8 @@ animatedpaned_set_revealed( Animatedpane *animatedpane, gboolean revealed )
 #endif /* DEBUG */
 
 	if( animatedpane->revealed != revealed ) {
+		animatedpane->revealed = revealed;
+
 		if( animatedpaned_enable_animations( animatedpane ) ) {
 			animatedpane->last_frame_time = -1;
 			animatedpane->elapsed = 0.0;
@@ -198,12 +207,10 @@ animatedpaned_set_revealed( Animatedpane *animatedpane, gboolean revealed )
 				animatedpaned_set_child_visibility( animatedpane, TRUE );
 
 			gtk_widget_add_tick_callback( GTK_WIDGET( animatedpane ),
-				animatedpane_animate_tick, GINT_TO_POINTER( revealed ),
-				NULL );
+				animatedpane_animate_tick, NULL, NULL );
 			}
 		else {
 			animatedpaned_set_child_visibility( animatedpane, revealed );
-			animatedpane->revealed = revealed;
 		}
 	}
 }

src/gtk/imagewindow.ui

@@ -200,7 +200,7 @@
         </child>
 
         <child>
-          <object class="Animatedpane" id="paned">
+          <object class="Animatedpane" id="properties_pane">
             <property name="wide-handle">true</property>
             <property name="resize-start-child">false</property>
             <property name="shrink-start-child">true</property>

src/imagewindow.c

@@ -1,10 +1,6 @@
 /*
 #define DEBUG
-*/
-
-/*
-#define EXPERIMENTAL_PROPERTIES_EDIT
-*/
+ */
 
 #include "vipsdisp.h"
 
@@ -61,7 +57,7 @@ struct _ImageWindow
 	GtkWidget *imagedisplay;
 	GtkWidget *display_bar;
 	GtkWidget *info_bar;
-	GtkWidget *paned;
+	GtkWidget *properties_pane;
 	GtkWidget *properties;
 
 	/* Throttle progress bar updates to a few per second with this.
@@ -786,10 +782,10 @@ image_window_close_action( GSimpleAction *action,
 	gtk_window_destroy( GTK_WINDOW( win ) );
 }
 
-/* From clutter-easing.c, based on Robert Penner's
- * infamous easing equations, MIT license.
+/* From clutter-easing.c, based on Robert Penner's infamous easing equations,
+ * MIT license.
  */
-double
+static double
 ease_out_cubic( double t )
 {
   double p = t - 1;
@@ -1456,7 +1452,7 @@ image_window_properties( GSimpleAction *action,
 	puts("image_window_properties");
 #endif /* DEBUG */
 
-	g_object_set( win->paned,
+	g_object_set( win->properties_pane,
 		"revealed", g_variant_get_boolean( state ),
 		NULL );
 
@@ -1585,7 +1581,7 @@ image_window_init( ImageWindow *win )
 		G_SETTINGS_BIND_DEFAULT );
 
 	g_settings_bind( win->settings, "properties",
-		G_OBJECT( win->paned ),
+		G_OBJECT( win->properties_pane ),
 		"revealed", 
 		G_SETTINGS_BIND_DEFAULT );
 
@@ -1636,7 +1632,7 @@ image_window_class_init( ImageWindowClass *class )
 	BIND( imagedisplay );
 	BIND( display_bar );
 	BIND( info_bar );
-	BIND( paned );
+	BIND( properties_pane );
 	BIND( properties );
 
 	gtk_widget_class_bind_template_callback( GTK_WIDGET_CLASS( class ),

src/imagewindow.h

@@ -16,7 +16,5 @@ void image_window_get_mouse_position( ImageWindow *win,
 GtkWidget *image_window_get_main_box( ImageWindow *win );
 GSettings *image_window_get_settings( ImageWindow *win );
 
-double ease_out_cubic( double t );
-
 #endif /* __IMAGE_WINDOW_H */