try to save pane position

hmmmm though it's not working

Author: jcupitt

README.md

@@ -242,7 +242,9 @@ then check the build status here:
     and improve the default position ... should be the width of the 
     properties widget
 
-- on props hide, force kb focus to iamgedisplay
+- on props hide, force kb focus to imagedisplay?
+
+    how can we tell if a child of $widget has the focus?
 
 - use eg. alt-left, alt-right to flip between images in "vipsdisp a.jpg b.jpg"
   or maybe shift-<, shift->? 

org.libvips.vipsdisp.gschema.xml

@@ -27,7 +27,15 @@
       <default>false</default>
       <summary>Show Properties menu</summary>
       <description>
-        If set, show the Properties menu.
+        If set, show the Properties pane.
+      </description>
+    </key>
+
+    <key type="i" name="properties-position">
+      <default>500</default>
+      <summary>Properties pane divider position</summary>
+      <description>
+        Position of the properties pane divider.
       </description>
     </key>
 

src/animatedpane.c

@@ -1,28 +1,23 @@
 /*
-#define DEBUG
  */
+#define DEBUG
 
 #include "vipsdisp.h"
 
 /* Duration of the GtkPaned enter/leave animations
  */
 #define PANED_DURATION (0.5)
 
-/* The initial position of the GtkPaned separator. When revealed, the 
- * child needs to be visible even on the smallest displays. We don't want
- * users to just see the separator on the far right of the window, since it 
- * might not be obvious what it is.
- */
-#define INITIAL_PANED_POSITION (200)
-
 struct _Animatedpane
 {
 	GtkWidget parent_instance;
 
 	GtkWidget *paned;
 
-	// the state we expose via properties
+	// right hand pane is visible
 	gboolean revealed;
+
+	// distance of the divider from the RIGHT edge of the window
 	int position;
 
 	// animation state.
@@ -113,12 +108,18 @@ animatedpaned_set_child_visibility( Animatedpane *animatedpane,
 		gtk_widget_show( child );
 	else
 		gtk_widget_hide( child );
+
 }
 
 static void
 animatedpaned_set_child_position( Animatedpane *animatedpane, int position )
 {
-	gtk_paned_set_position( GTK_PANED( animatedpane->paned ), position );
+	// our position is distance from the right edge -- we must swap this
+	int widget_width = gtk_widget_get_width( GTK_WIDGET( animatedpane ) );
+	int paned_position = widget_width - position;
+	
+	gtk_paned_set_position( GTK_PANED( animatedpane->paned ), 
+		paned_position );
 }
 
 /* From clutter-easing.c, based on Robert Penner's infamous easing equations,
@@ -144,9 +145,9 @@ animatedpane_animate_tick( GtkWidget *widget, GdkFrameClock *frame_clock,
     gint64 dt = animatedpane->last_frame_time > 0 ?
         frame_time - animatedpane->last_frame_time :
         0;
+	animatedpane->last_frame_time = frame_time;
 
     animatedpane->elapsed += (double) dt / G_TIME_SPAN_SECOND;
-	animatedpane->last_frame_time = frame_time;
 
     t = ease_out_cubic( animatedpane->elapsed / PANED_DURATION );
 
@@ -189,16 +190,10 @@ animatedpaned_set_revealed( Animatedpane *animatedpane, gboolean revealed )
 			animatedpane->elapsed = 0.0;
 			animatedpane->is_animating = TRUE;
 
-			if( revealed ) {
-				animatedpane->start = 
-						gtk_widget_get_width( GTK_WIDGET( animatedpane ) );
-				animatedpane->stop = animatedpane->position;
-			}
-			else {
-				animatedpane->start = animatedpane->position;
-				animatedpane->stop = 
-						gtk_widget_get_width( GTK_WIDGET( animatedpane ) );
-			}
+			animatedpane->start = animatedpane->position;
+			animatedpane->stop = 0;
+			if( revealed )
+				VIPS_SWAP( int, animatedpane->start, animatedpane->stop );
 
 			animatedpaned_set_child_position( animatedpane,
 				animatedpane->start );
@@ -208,10 +203,9 @@ animatedpaned_set_revealed( Animatedpane *animatedpane, gboolean revealed )
 
 			gtk_widget_add_tick_callback( GTK_WIDGET( animatedpane ),
 				animatedpane_animate_tick, NULL, NULL );
-			}
-		else {
-			animatedpaned_set_child_visibility( animatedpane, revealed );
 		}
+		else 
+			animatedpaned_set_child_visibility( animatedpane, revealed );
 	}
 }
 
@@ -257,12 +251,14 @@ animatedpane_set_property( GObject *object,
 }
 #endif /*DEBUG*/
 
-	// no need to implement set_position, the notify callback from the paned
-	// will do it
-
 	if( prop_id == PROP_REVEALED ) 
 		animatedpaned_set_revealed( animatedpane, 
 			g_value_get_boolean( value ) );
+	else if( prop_id == PROP_POSITION ) {
+		animatedpane->position = g_value_get_int( value );
+		animatedpaned_set_child_position( animatedpane, 
+			animatedpane->position );
+	}
 	else if( prop_id < PROP_REVEALED ) 
 		g_object_set_property( G_OBJECT( animatedpane->paned ), 
 			prop_names[prop_id], value );
@@ -313,12 +309,18 @@ animatedpane_position_notify( GtkWidget *paned,
 	if( animatedpane->revealed &&
 		!animatedpane->is_animating ) {
 		// FIXME ... could get from pspec?
-		animatedpane->position = gtk_paned_get_position( GTK_PANED( paned ) );
+		int paned_position = gtk_paned_get_position( GTK_PANED( paned ) );
+
+		// our position is distance from the right edge -- we must swap this
+		int widget_width = gtk_widget_get_width( GTK_WIDGET( animatedpane ) );
+		int position = widget_width - paned_position;
 
 #ifdef DEBUG
-		printf( "animatedpane_position_notify: new position %d\n", 
-				animatedpane->position );
+		printf( "animatedpane_position_notify: new position %d\n", position );
 #endif /* DEBUG */
+
+		if( animatedpane->position != position )
+			g_object_set( animatedpane, "position", position, NULL );
 	}
 }
 
@@ -329,7 +331,8 @@ animatedpane_init( Animatedpane *animatedpane )
 	printf( "animatedpane_init:\n" ); 
 #endif /*DEBUG*/
 
-	animatedpane->position = INITIAL_PANED_POSITION;
+	// distance of the divider from the RIGHT edge of the window
+	animatedpane->position = 500;
 
 	// it'd be nice to create our gtkpaned in animatedpane.ui, but we need 
 	// this pointer during builder 

src/imagewindow.c

@@ -522,6 +522,7 @@ image_window_duplicate_action( GSimpleAction *action,
 	copy_state( GTK_WIDGET( new ), GTK_WIDGET( win ), "control" );
 	copy_state( GTK_WIDGET( new ), GTK_WIDGET( win ), "info" );
 	copy_state( GTK_WIDGET( new ), GTK_WIDGET( win ), "properties" );
+	copy_state( GTK_WIDGET( new ), GTK_WIDGET( win ), "properties-position" );
 	copy_state( GTK_WIDGET( new ), GTK_WIDGET( win ), "background" );
 
 	/* We want to init the scroll position, but we can't do that until the
@@ -1585,6 +1586,18 @@ image_window_init( ImageWindow *win )
 		"revealed", 
 		G_SETTINGS_BIND_DEFAULT );
 
+	g_settings_bind( win->settings, "properties-position",
+		G_OBJECT( win->properties_pane ),
+		"position", 
+		G_SETTINGS_BIND_DEFAULT );
+
+	/* Initialise from settings.
+	 */
+	change_state( GTK_WIDGET( win ), "properties", 
+		g_settings_get_value( win->settings, "properties" ) );
+	change_state( GTK_WIDGET( win ), "properties-position", 
+		g_settings_get_value( win->settings, "properties-position" ) );
+
 	/* Initial menu state from settings.
 	 */
 	change_state( GTK_WIDGET( win ), "control", 
@@ -1758,7 +1771,7 @@ image_window_open( ImageWindow *win, GFile *file )
 	TileSource *tile_source;
 
 #ifdef DEBUG
-	puts( "image_window_open" );
+	printf( "image_window_open:\n" );
 #endif /* DEBUG */
 
 	path = g_file_get_path( file );
@@ -1769,11 +1782,6 @@ image_window_open( ImageWindow *win, GFile *file )
 		return;
 	}
 
-	/* Re-initialize from settings.
-	 */
-	change_state( GTK_WIDGET( win ), "properties", 
-		g_settings_get_value( win->settings, "properties" ) );
-
 	image_window_set_tile_source( win, tile_source );
 
 	g_object_unref( tile_source );