callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display: Fix statusbar tool icon offset

Browse Source 
The Y offset of the statusbar tool icon is too large, which pushes it
off-screen. This scales the offset by the size of the icon to
prevent this problem.
This commit is contained in:
Alx Sa
2023-01-20 03:26:13 +00:00
committed by Jehan
parent 49310e5943
commit c9f518a65c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/display/gimpstatusbar.c
View File

@ -55,6 +55,9 @@
/* spacing between the icon and the statusbar label */ /* spacing between the icon and the statusbar label */
#define ICON_SPACING 2 #define ICON_SPACING 2
/* width/height of the statusbar icon rect */
#define ICON_SIZE 16
/* timeout (in milliseconds) for temporary statusbar messages */ /* timeout (in milliseconds) for temporary statusbar messages */
#define MESSAGE_TIMEOUT 8000 #define MESSAGE_TIMEOUT 8000
@ -1342,7 +1345,7 @@ gimp_statusbar_label_expose (GtkWidget *widget,
/* the rectangle width is negative when rendering right-to-left */ /* the rectangle width is negative when rendering right-to-left */
x += PANGO_PIXELS (rect.x) + (rect.width < 0 ? x += PANGO_PIXELS (rect.x) + (rect.width < 0 ?
PANGO_PIXELS (rect.width) : 0); PANGO_PIXELS (rect.width) : 0);
y += PANGO_PIXELS (rect.y); y += PANGO_PIXELS (rect.y / ICON_SIZE);
gdk_cairo_set_source_pixbuf (cr, statusbar->icon, x, y); gdk_cairo_set_source_pixbuf (cr, statusbar->icon, x, y);
cairo_paint (cr); cairo_paint (cr);
@ -1734,7 +1737,7 @@ gimp_statusbar_load_icon (GimpStatusbar *statusbar,
if (icon) if (icon)
return g_object_ref (icon); return g_object_ref (icon);
icon = gimp_widget_load_icon (statusbar->label, icon_name, 16); icon = gimp_widget_load_icon (statusbar->label, icon_name, ICON_SIZE);
/* this is not optimal but so what */ /* this is not optimal but so what */
if (g_hash_table_size (statusbar->icon_hash) > 16) if (g_hash_table_size (statusbar->icon_hash) > 16)