fixes

Author: mtwebster

libnemo-private/nemo-preview-details.c

@@ -201,18 +201,36 @@ nemo_preview_details_set_file (NemoPreviewDetails *widget,
 			gtk_label_set_text (GTK_LABEL (priv->permissions_value_label), "—");
 		}
 
-		/* Location */
-		location = nemo_file_get_location (file);
-		parent = g_file_get_parent (location);
-		if (parent != NULL) {
-			parent_path = g_file_get_parse_name (parent);
-			gtk_label_set_text (GTK_LABEL (priv->location_value_label), parent_path);
-			g_free (parent_path);
-			g_object_unref (parent);
+		/* Location - use activation URI to get real location for virtual folders */
+		str = nemo_file_get_activation_uri (file);
+		if (str != NULL) {
+			location = g_file_new_for_uri (str);
+			g_free (str);
+
+			parent = g_file_get_parent (location);
+			if (parent != NULL) {
+				parent_path = g_file_get_parse_name (parent);
+				gtk_label_set_text (GTK_LABEL (priv->location_value_label), parent_path);
+				g_free (parent_path);
+				g_object_unref (parent);
+			} else {
+				gtk_label_set_text (GTK_LABEL (priv->location_value_label), "—");
+			}
+			g_object_unref (location);
 		} else {
-			gtk_label_set_text (GTK_LABEL (priv->location_value_label), "—");
+			/* Fallback to regular location if no activation URI */
+			location = nemo_file_get_location (file);
+			parent = g_file_get_parent (location);
+			if (parent != NULL) {
+				parent_path = g_file_get_parse_name (parent);
+				gtk_label_set_text (GTK_LABEL (priv->location_value_label), parent_path);
+				g_free (parent_path);
+				g_object_unref (parent);
+			} else {
+				gtk_label_set_text (GTK_LABEL (priv->location_value_label), "—");
+			}
+			g_object_unref (location);
 		}
-		g_object_unref (location);
 	}
 }
 

libnemo-private/nemo-preview-image.c

@@ -110,7 +110,7 @@ nemo_preview_image_init (NemoPreviewImage *preview)
 
 	/* Create frame to hold drawing area */
 	priv->frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), GTK_SHADOW_IN);
+	gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), GTK_SHADOW_NONE);
 	gtk_widget_set_halign (priv->frame, GTK_ALIGN_FILL);
 	gtk_widget_set_valign (priv->frame, GTK_ALIGN_FILL);
 	gtk_widget_set_hexpand (priv->frame, TRUE);

src/nemo-window-private.h

@@ -102,6 +102,7 @@ struct NemoWindowDetails
         /* preview pane */
         GtkWidget *preview_pane;        // NemoPreviewPane instance
         gboolean show_preview_pane;     // State flag
+        gboolean preview_pane_width_set; // Initial width has been set from settings
 
         gboolean disable_chrome;
 

src/nemo-window.c

@@ -2241,11 +2241,49 @@ preview_pane_selection_changed_callback (NemoView *view, NemoWindow *window)
 	nemo_file_list_free (selection);
 }
 
+static void
+set_preview_pane_width_from_settings (NemoWindow *window)
+{
+	gint saved_width, position, total_width;
+
+	/* Only set initial position once */
+	if (window->details->preview_pane_width_set) {
+		return;
+	}
+
+	window->details->preview_pane_width_set = TRUE;
+
+	/* Set position based on saved preview pane width */
+	saved_width = g_settings_get_int (nemo_preview_pane_preferences, "pane-width");
+	total_width = gtk_widget_get_allocated_width (window->details->split_view_hpane);
+
+	if (saved_width > 100 && total_width > saved_width) {
+		/* Position is from left, so subtract preview width from total */
+		position = total_width - saved_width;
+		gtk_paned_set_position (GTK_PANED (window->details->split_view_hpane), position);
+	} else {
+		/* Fallback: 60/40 split */
+		gtk_paned_set_position (GTK_PANED (window->details->split_view_hpane), total_width * 0.6);
+	}
+}
+
+static void
+preview_pane_realize_callback (GtkWidget *widget, gpointer user_data)
+{
+	NemoWindow *window = NEMO_WINDOW (user_data);
+	set_preview_pane_width_from_settings (window);
+}
+
 static void
 preview_pane_position_changed_callback (GObject *paned, GParamSpec *pspec, NemoWindow *window)
 {
 	gint position, total_width, preview_width;
 
+	/* Don't save position until initial width has been set */
+	if (!window->details->preview_pane_width_set) {
+		return;
+	}
+
 	position = gtk_paned_get_position (GTK_PANED (paned));
 	total_width = gtk_widget_get_allocated_width (GTK_WIDGET (paned));
 
@@ -2344,6 +2382,9 @@ nemo_window_preview_pane_on (NemoWindow *window)
 		nemo_window_split_view_off (window);
 	}
 
+	/* Reset flag so position can be set */
+	window->details->preview_pane_width_set = FALSE;
+
 	/* Create preview pane */
 	window->details->preview_pane = nemo_preview_pane_new (window);
 
@@ -2354,19 +2395,15 @@ nemo_window_preview_pane_on (NemoWindow *window)
 
 	gtk_widget_show (window->details->preview_pane);
 
-	/* Set position from saved settings */
-	gint saved_width = g_settings_get_int (nemo_preview_pane_preferences, "pane-width");
-	gint total_width = gtk_widget_get_allocated_width (window->details->split_view_hpane);
-	gint position;
-
-	if (saved_width > 100 && total_width > saved_width) {
-		/* Position is measured from left, so subtract preview width from total */
-		position = total_width - saved_width;
-		gtk_paned_set_position (GTK_PANED (window->details->split_view_hpane), position);
+	/* Set position from settings - check if paned is already realized */
+	if (gtk_widget_get_realized (window->details->split_view_hpane)) {
+		/* Already realized, set position immediately */
+		set_preview_pane_width_from_settings (window);
 	} else {
-		/* Fallback to 60/40 split if no saved value */
-		gtk_paned_set_position (GTK_PANED (window->details->split_view_hpane),
-		                        total_width * 0.6);
+		/* Not realized yet, wait for realize signal */
+		g_signal_connect (window->details->split_view_hpane, "realize",
+		                  G_CALLBACK (preview_pane_realize_callback),
+		                  window);
 	}
 
 	/* Connect signal to save position on resize */
@@ -2418,7 +2455,10 @@ nemo_window_preview_pane_off (NemoWindow *window)
 		return;
 	}
 
-	/* Disconnect position signal */
+	/* Disconnect signals */
+	g_signal_handlers_disconnect_by_func (window->details->split_view_hpane,
+	                                      G_CALLBACK (preview_pane_realize_callback),
+	                                      window);
 	g_signal_handlers_disconnect_by_func (window->details->split_view_hpane,
 	                                      G_CALLBACK (preview_pane_position_changed_callback),
 	                                      window);