Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of scaled bitmaps in wxToolBar with GTK+3

Browse Source 
We have to draw them ourselves to get the size right.
See #18225
This commit is contained in:
Paul Cornett
2018-10-30 22:59:07 -07:00
parent 8a76b8072a
commit 8c99df373a
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/toolbar.cpp
View File

@@ -180,15 +180,20 @@ image_draw(GtkWidget* widget, cairo_t* cr, wxToolBarTool* tool)
image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool) image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool)
#endif #endif
{ {
#ifdef __WXGTK3__
const wxBitmap& bitmap = tool->GetBitmap();
if (!bitmap.IsOk() || (tool->IsEnabled() && bitmap.GetScaleFactor() <= 1))
return false;
#else
const wxBitmap& bitmap = tool->GetDisabledBitmap(); const wxBitmap& bitmap = tool->GetDisabledBitmap();
if (tool->IsEnabled() || !bitmap.IsOk()) if (tool->IsEnabled() || !bitmap.IsOk())
return false; return false;
#endif
// draw disabled bitmap ourselves, GtkImage has no way to specify it
GtkAllocation alloc; GtkAllocation alloc;
gtk_widget_get_allocation(widget, &alloc); gtk_widget_get_allocation(widget, &alloc);
int x = (alloc.width - bitmap.GetWidth()) / 2; int x = (alloc.width - bitmap.GetScaledWidth()) / 2;
int y = (alloc.height - bitmap.GetHeight()) / 2; int y = (alloc.height - bitmap.GetScaledHeight()) / 2;
#ifdef __WXGTK3__ #ifdef __WXGTK3__
bitmap.Draw(cr, x, y); bitmap.Draw(cr, x, y);
#else #else
@@ -266,10 +271,25 @@ void wxToolBarTool::SetImage()
wxCHECK_RET(bitmap.IsOk(), "invalid bitmap for wxToolBar icon"); wxCHECK_RET(bitmap.IsOk(), "invalid bitmap for wxToolBar icon");
GtkWidget* image = gtk_tool_button_get_icon_widget(GTK_TOOL_BUTTON(m_item)); GtkWidget* image = gtk_tool_button_get_icon_widget(GTK_TOOL_BUTTON(m_item));
#ifdef __WXGTK3__
if (bitmap.GetScaleFactor() > 1)
{
// Use a scaled pixbuf with the correct logical size. It will be used
// for the disabled state if no disabled bitmap is specifed, otherwise
// the original will be used by our "draw" signal handler.
GdkPixbuf* pixbuf = gdk_pixbuf_scale_simple(bitmap.GetPixbuf(),
bitmap.GetScaledWidth(), bitmap.GetScaledHeight(), GDK_INTERP_BILINEAR);
gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
g_object_unref(pixbuf);
}
else
#endif
{
// always use pixbuf, because pixmap mask does not // always use pixbuf, because pixmap mask does not
// work with disabled images in some themes // work with disabled images in some themes
gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf()); gtk_image_set_from_pixbuf(GTK_IMAGE(image), bitmap.GetPixbuf());
} }
}
// helper to create a dropdown menu item // helper to create a dropdown menu item
void wxToolBarTool::CreateDropDown() void wxToolBarTool::CreateDropDown()