Mercurial > geeqie.yaz

diff src/layout_image.c @ 175:682705e0c0e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not show frame for full-window images
author nadvornik
date Mon, 11 Feb 2008 15:23:43 +0000
parents 126724275319
children f6e307c7bad6
line wrap: on
line diff
--- a/src/layout_image.c	Mon Feb 11 12:51:28 2008 +0000
+++ b/src/layout_image.c	Mon Feb 11 15:23:43 2008 +0000
@@ -1693,8 +1693,15 @@
 	if (!lw->split_images[0])
 		{
 		layout_image_new(lw, 0);
+		image_set_frame(lw->split_images[0], (!lw->tools_float && !lw->tools_hidden));
+		image_set_selectable(lw->split_images[0], 0);
 		layout_image_activate(lw, 0);
 		}
+	else
+		{
+		image_set_frame(lw->split_images[0], (!lw->tools_float && !lw->tools_hidden));
+		image_set_selectable(lw->split_images[0], 0);
+		}
 		
 	for (i=1; i < MAX_SPLIT_IMAGES; i++)
 		{
@@ -1705,13 +1712,12 @@
 			}
 		}
 
+
 	layout_image_activate(lw, 0);
-	image_set_selectable(lw->split_images[0], 0);
 	
 	lw->split_image_widget = lw->split_images[0]->widget;
 			
 	return lw->split_image_widget;
-
 }
 
 GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal)
@@ -1725,10 +1731,14 @@
 		{
 		layout_image_new(lw, 0);
 		}
+	image_set_frame(lw->split_images[0], 1);
+	image_set_selectable(lw->split_images[0], 1);
 
 	if (!lw->split_images[1])
 		{
 		layout_image_new(lw, 1);
+		image_set_frame(lw->split_images[1], 1);
+		image_set_selectable(lw->split_images[1], 1);
 		if (lw->image)
 			{
 			gdouble sx, sy;
@@ -1740,6 +1750,11 @@
 		layout_image_deactivate(lw, 1);
 		layout_image_activate(lw, 0);
 		}
+	else
+		{
+		image_set_frame(lw->split_images[1], 1);
+		image_set_selectable(lw->split_images[1], 1);
+		}
 
 	
 	for (i=2; i < MAX_SPLIT_IMAGES; i++)
@@ -1751,9 +1766,6 @@
 			}
 		}
 
-	image_set_selectable(lw->split_images[0], 1);
-	image_set_selectable(lw->split_images[1], 1);
-
         if (!lw->image || lw->active_split_image < 0 || lw->active_split_image > 1)
 		{
 		layout_image_activate(lw, 0);
@@ -1792,6 +1804,9 @@
 		layout_image_new(lw, 0);
 		}
 
+	image_set_frame(lw->split_images[0], 1);
+	image_set_selectable(lw->split_images[0], 1);
+
 	if (!lw->split_images[1])
 		{
 		layout_image_activate(lw, 0);
@@ -1801,6 +1816,8 @@
 		if (!lw->split_images[i])
 			{
 			layout_image_new(lw, i);
+			image_set_frame(lw->split_images[i], 1);
+			image_set_selectable(lw->split_images[i], 1);
 			if (lw->image)
 				{
 				gdouble sx, sy;
@@ -1811,6 +1828,11 @@
 				}
 			layout_image_deactivate(lw, i);
 			}
+		else
+			{
+			image_set_frame(lw->split_images[i], 1);
+			image_set_selectable(lw->split_images[i], 1);
+			}
 
 	for (i=4; i < MAX_SPLIT_IMAGES; i++)
 		{
@@ -1821,10 +1843,6 @@
 			}
 		}
 
-	image_set_selectable(lw->split_images[0], 1);
-	image_set_selectable(lw->split_images[1], 1);
-	image_set_selectable(lw->split_images[2], 1);
-	image_set_selectable(lw->split_images[3], 1);
 
         if (!lw->image || lw->active_split_image < 0 || lw->active_split_image > 3)
 		{