Revision: 1265
http://geeqie.svn.sourceforge.net/geeqie/?rev=1265&view=rev
Author: zas_
Date: 2008-11-22 22:04:21 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Use common code for layout_image_setup_split_none() too.
Modified Paths:
--------------
trunk/src/layout_image.c
Modified: trunk/src/layout_image.c
===================================================================
--- trunk/src/layout_image.c 2008-11-22 21:58:07 UTC (rev 1264)
+++ trunk/src/layout_image.c 2008-11-22 22:04:21 UTC (rev 1265)
@@ -1588,55 +1588,16 @@
}
-GtkWidget *layout_image_setup_split_none(LayoutWindow *lw)
-{
- gint i;
-
- lw->split_mode = SPLIT_NONE;
-
- 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++)
- {
- if (lw->split_images[i])
- {
-#if GTK_CHECK_VERSION(2,12,0)
- g_object_unref(lw->split_images[i]->widget);
-#else
- gtk_widget_unref(lw->split_images[i]->widget);
-#endif
- lw->split_images[i] = NULL;
- }
- }
-
-
- layout_image_activate(lw, 0);
-
- lw->split_image_widget = lw->split_images[0]->widget;
-
- return lw->split_image_widget;
-}
-
static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
{
+ gboolean frame = (n == 1) ? (!lw->tools_float && !lw->tools_hidden) : 1;
gint i;
for (i = 0; i < n; i++)
if (!lw->split_images[i])
{
layout_image_new(lw, i);
- image_set_frame(lw->split_images[i], 1);
+ image_set_frame(lw->split_images[i], frame);
image_set_selectable(lw->split_images[i], 1);
if (lw->image)
{
@@ -1650,7 +1611,7 @@
}
else
{
- image_set_frame(lw->split_images[i], 1);
+ image_set_frame(lw->split_images[i], frame);
image_set_selectable(lw->split_images[i], 1);
}
@@ -1674,6 +1635,18 @@
}
+GtkWidget *layout_image_setup_split_none(LayoutWindow *lw)
+{
+ lw->split_mode = SPLIT_NONE;
+
+ layout_image_setup_split_common(lw, 1);
+
+ lw->split_image_widget = lw->split_images[0]->widget;
+
+ return lw->split_image_widget;
+}
+
+
GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal)
{
GtkWidget *paned;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
