projects / geeqie.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix #1204: Geeqie crashes if double-clicked on empty space in file lis
[geeqie.git] / src / image.cc
diff --git a/src/image.cc b/src/image.cc
index e1d88f5..2d11182 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -33,6 +33,7 @@
 #include "pixbuf-renderer.h"
 #include "pixbuf-util.h"
 #include "ui-fileops.h"
+#include "ui-misc.h"
 #include "filecache.h"
 
 #include <cmath>
@@ -186,6 +187,20 @@ static void image_press_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer d
                }
 }
 
+static void image_release_cb(PixbufRenderer *, GdkEventButton *event, gpointer data)
+{
+       auto imd = static_cast<ImageWindow *>(data);
+       LayoutWindow *lw;
+
+       lw = layout_find_by_image(imd);
+       if (!lw)
+               {
+               layout_valid(&lw);
+               }
+
+       defined_mouse_buttons(NULL, event, lw);
+}
+
 static void image_drag_cb(PixbufRenderer *pr, GdkEventMotion *event, gpointer data)
 {
        auto imd = static_cast<ImageWindow *>(data);
@@ -883,31 +898,7 @@ static void image_load_done_cb(ImageLoader *, gpointer data)
 
        if (!image_loader_get_pixbuf(imd->il))
                {
-               GdkPixbuf *pixbuf;
-
-               switch (imd->image_fd->format_class)
-                       {
-                       case FORMAT_CLASS_UNKNOWN:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_UNKNOWN);
-                               break;
-                       case FORMAT_CLASS_META:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_METADATA);
-                               break;
-                       case FORMAT_CLASS_VIDEO:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_VIDEO);
-                               break;
-                       case FORMAT_CLASS_COLLECTION:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_COLLECTION);
-                               break;
-                       case FORMAT_CLASS_DOCUMENT:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_ICON_PDF);
-                               break;
-                       case FORMAT_CLASS_ARCHIVE:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_ARCHIVE);
-                               break;
-                       default:
-                               pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
-                       }
+               GdkPixbuf *pixbuf = pixbuf_fallback(imd->image_fd, 0, 0);
 
                image_change_pixbuf(imd, pixbuf, image_zoom_get(imd), FALSE);
                g_object_unref(pixbuf);
@@ -1891,15 +1882,15 @@ void image_top_window_set_sync(ImageWindow *imd, gboolean allow_sync)
        g_object_set(G_OBJECT(imd->pr), "window_fit", allow_sync, NULL);
 }
 
-void image_background_set_color(ImageWindow *imd, GdkColor *color)
+void image_background_set_color(ImageWindow *imd, GdkRGBA *color)
 {
        pixbuf_renderer_set_color(reinterpret_cast<PixbufRenderer *>(imd->pr), color);
 }
 
 void image_background_set_color_from_options(ImageWindow *imd, gboolean fullscreen)
 {
-       GdkColor *color = nullptr;
-       GdkColor theme_color;
+       GdkRGBA *color = nullptr;
+       GdkRGBA theme_color;
        GdkRGBA bg_color;
        GtkStyleContext *style_context;
        LayoutWindow *lw = nullptr;
@@ -1917,9 +1908,9 @@ void image_background_set_color_from_options(ImageWindow *imd, gboolean fullscre
                style_context = gtk_widget_get_style_context(lw->window);
                gtk_style_context_get_background_color(style_context, GTK_STATE_FLAG_NORMAL, &bg_color);
 
-               theme_color.red = bg_color.red * 65535;
-               theme_color.green = bg_color.green * 65535;
-               theme_color.blue = bg_color.blue * 65535;
+               theme_color.red = bg_color.red * 1;
+               theme_color.green = bg_color.green * 1;
+               theme_color.blue = bg_color.blue * 1;
 
                color = &theme_color;
                }
@@ -2023,7 +2014,7 @@ void image_set_selectable(ImageWindow *imd, gboolean selectable)
 {
        if (!imd->has_frame) return;
 
-       gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
        gtk_container_set_border_width(GTK_CONTAINER(imd->frame), selectable ? 4 : 0);
 }
 
@@ -2122,28 +2113,17 @@ gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer)
 {
        GtkAllocation allocation;
        gtk_widget_get_allocation(widget, &allocation);
-       gtk_paint_flat_box(gtk_widget_get_style(widget),
-                          cr,
-                          gtk_widget_get_state(widget),
-                          gtk_frame_get_shadow_type(GTK_FRAME(widget)),
-                          widget,
-                          nullptr,
-                          allocation.x + 3, allocation.y + 3,
-                          allocation.width - 6, allocation.height - 6);
+
+       gtk_render_frame(gtk_widget_get_style_context(widget), cr, allocation.x + 3, allocation.y + 3, allocation.width - 6, allocation.height - 6);
+       gtk_render_background(gtk_widget_get_style_context(widget), cr, allocation.x + 3, allocation.y + 3, allocation.width - 6, allocation.height - 6);
 
        if (gtk_widget_has_focus(widget))
                {
-               gtk_paint_focus(gtk_widget_get_style(widget), cr, GTK_STATE_ACTIVE,
-                               widget, "image_window",
-                               allocation.x, allocation.y,
-                               allocation.width - 1, allocation.height - 1);
+               gtk_render_focus(gtk_widget_get_style_context(widget), cr, allocation.x, allocation.y, allocation.width - 1, allocation.height - 1);
                }
        else
                {
-               gtk_paint_shadow(gtk_widget_get_style(widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_IN,
-                                widget, "image_window",
-                                allocation.x, allocation.y,
-                                allocation.width - 1, allocation.height - 1);
+               gtk_render_frame(gtk_widget_get_style_context(widget), cr, allocation.x, allocation.y, allocation.width - 1, allocation.height - 1);
                }
        return FALSE;
 }
@@ -2162,7 +2142,7 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                DEBUG_NAME(imd->frame);
                g_object_ref(imd->pr);
                if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
-               gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
+               gq_gtk_container_add(GTK_WIDGET(imd->frame), imd->pr);
 
                g_object_unref(imd->pr);
                gtk_widget_set_can_focus(imd->frame, TRUE);
@@ -2173,7 +2153,7 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
                                 G_CALLBACK(image_focus_in_cb), imd);
 
-               gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
                gtk_widget_show(imd->frame);
                }
        else
@@ -2182,10 +2162,10 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                if (imd->frame)
                        {
                        gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
-                       gtk_widget_destroy(imd->frame);
+                       g_object_unref(imd->frame);
                        imd->frame = nullptr;
                        }
-               gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
 
                g_object_unref(imd->pr);
                }
@@ -2224,6 +2204,8 @@ ImageWindow *image_new(gboolean frame)
                         G_CALLBACK(image_click_cb), imd);
        g_signal_connect(G_OBJECT(imd->pr), "button_press_event",
                         G_CALLBACK(image_press_cb), imd);
+       g_signal_connect(G_OBJECT(imd->pr), "button_release_event",
+                        G_CALLBACK(image_release_cb), imd);
        g_signal_connect(G_OBJECT(imd->pr), "scroll_notify",
                         G_CALLBACK(image_scroll_notify_cb), imd);
 
Image viewer forked from GQView