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

Disable scrollbars for dropdown lists. wxGTK doesn't support them at all, we would have to do it manually. For now disabling scrolling mostly fixes #51

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-23 14:58:54 +02:00
parent 83448a1667
commit e570fa8346
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/drop_down_list.cpp
+5 -1
View File
@@ -77,7 +77,7 @@ DropDownList::DropDownList(Window* parent, bool is_submenu, ValueViewer* viewer)
dc.SetFont(*wxNORMAL_FONT); dc.SetFont(*wxNORMAL_FONT);
int h; int h;
dc.GetTextExtent(_("X"), 0, &h); dc.GetTextExtent(_("X"), 0, &h);
item_size.height = h + 2; item_size.height = h + 2.0;
} }
DropDownList::~DropDownList() { DropDownList::~DropDownList() {
@@ -135,6 +135,9 @@ void DropDownList::show(bool in_place, wxPoint pos, RealRect* rect) {
SetVirtualSize(virtual_size); SetVirtualSize(virtual_size);
item_size.width = virtual_size.width - marginW * 2; item_size.width = virtual_size.width - marginW * 2;
// is there enough room for all items, or do we need a scrollbar? // is there enough room for all items, or do we need a scrollbar?
#if !defined(__WXGTK__)
// Note: wxGTK doesn't support scrollbars on popup windows
// For now we disable them to not make MSE crash
int room_below = wxGetDisplaySize().y - border_size.height - pos.y - parent_height - 50; int room_below = wxGetDisplaySize().y - border_size.height - pos.y - parent_height - 50;
int max_height = max(300, room_below); int max_height = max(300, room_below);
if (size.height > max_height) { if (size.height > max_height) {
@@ -144,6 +147,7 @@ void DropDownList::show(bool in_place, wxPoint pos, RealRect* rect) {
} else { } else {
SetScrollbar(wxVERTICAL,0,0,0,false); SetScrollbar(wxVERTICAL,0,0,0,false);
} }
#endif
// move & resize // move & resize
SetSize(add_diagonal(size, border_size)); SetSize(add_diagonal(size, border_size));
Position(pos, wxSize(0, parent_height)); Position(pos, wxSize(0, parent_height));