amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 05:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #15, menu and toolbar icons on wxGTK

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-01 12:55:43 +02:00
parent 1fb3f15aff
commit 6c4277bd35
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/util.cpp
+15 -4
View File
@@ -241,10 +241,17 @@ Image generate_disabled_image(Image const& image) {
} }
void set_menu_item_image(wxMenuItem* item, const String& resource) { void set_menu_item_image(wxMenuItem* item, const String& resource) {
#if defined(__WXGTK__)
if (item->GetKind() == wxITEM_CHECK) return; // check items can't have icons
#endif
Image bitmap = load_resource_tool_image(resource); Image bitmap = load_resource_tool_image(resource);
Image disabled_bitmap = generate_disabled_image(bitmap); #if defined(__WXMSW__)
item->SetBitmaps(bitmap, bitmap); Image disabled_bitmap = generate_disabled_image(bitmap);
item->SetDisabledBitmap(disabled_bitmap); item->SetBitmaps(bitmap, bitmap);
item->SetDisabledBitmap(disabled_bitmap);
#else
item->SetBitmap(bitmap);
#endif
} }
wxMenuItem* make_menu_item(wxMenu* menu, int id, const char* resource, const String& text, const String& help, wxItemKind kind, wxMenu* submenu) { wxMenuItem* make_menu_item(wxMenu* menu, int id, const char* resource, const String& text, const String& help, wxItemKind kind, wxMenu* submenu) {
@@ -278,7 +285,11 @@ wxToolBarToolBase* add_tool(wxToolBar* toolbar, int id, const char* resource, co
wxPoint pos((size.GetWidth() - bitmap.GetWidth()) / 2, (size.GetHeight() - bitmap.GetHeight()) / 2); wxPoint pos((size.GetWidth() - bitmap.GetWidth()) / 2, (size.GetHeight() - bitmap.GetHeight()) / 2);
bitmap.Resize(size, pos); bitmap.Resize(size, pos);
} }
Image disabled_bitmap = generate_disabled_image(bitmap); #if defined(__WXGTK__)
wxBitmap disabled_bitmap = wxNullBitmap; // gtk can produce decent disabled bitmaps by itself
#else
Image disabled_bitmap = generate_disabled_image(bitmap);
#endif
auto tool = new wxToolBarToolBase(toolbar, id, label, bitmap, disabled_bitmap, kind, nullptr, tooltip, help); auto tool = new wxToolBarToolBase(toolbar, id, label, bitmap, disabled_bitmap, kind, nullptr, tooltip, help);
toolbar->AddTool(tool); toolbar->AddTool(tool);
return tool; return tool;