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

Fix #50

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-23 12:46:21 +02:00
parent b2e6f03c29
commit d97cfce85d
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/filter_ctrl.cpp
+11
View File
@@ -39,8 +39,11 @@ FilterCtrl::FilterCtrl(wxWindow* parent, int id, String const& placeholder, Stri
, help_text(help_text) , help_text(help_text)
{ {
wxColour bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); wxColour bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
#if !defined(__WXGTK__)
// Note: in wxGTK, it is not possible to add child windows to standard controls
clear_button = new HoverButton(this, wxID_ANY, _("btn_clear_filter"), bg, false); clear_button = new HoverButton(this, wxID_ANY, _("btn_clear_filter"), bg, false);
clear_button->SetCursor(*wxSTANDARD_CURSOR); clear_button->SetCursor(*wxSTANDARD_CURSOR);
#endif
onSize(); onSize();
update(); update();
} }
@@ -84,7 +87,9 @@ void FilterCtrl::update() {
font.SetStyle(wxFONTSTYLE_ITALIC); font.SetStyle(wxFONTSTYLE_ITALIC);
SetFont(font); SetFont(font);
} }
#if !defined(__WXGTK__)
clear_button->Show(!value.empty()); clear_button->Show(!value.empty());
#endif
changing = false; changing = false;
} }
@@ -110,10 +115,12 @@ void FilterCtrl::onSizeEvent(wxSizeEvent&) {
onSize(); onSize();
} }
void FilterCtrl::onSize() { void FilterCtrl::onSize() {
#if !defined(__WXGTK__)
wxSize s = GetClientSize(); wxSize s = GetClientSize();
wxSize cs = clear_button->GetBestSize(); wxSize cs = clear_button->GetBestSize();
int margin = 2; int margin = 2;
clear_button->SetSize(s.x - cs.x - margin, (s.y-cs.y)/2, cs.x, cs.y); clear_button->SetSize(s.x - cs.x - margin, (s.y-cs.y)/2, cs.x, cs.y);
#endif
} }
void FilterCtrl::onSetFocus(wxFocusEvent& ev) { void FilterCtrl::onSetFocus(wxFocusEvent& ev) {
@@ -134,7 +141,11 @@ void FilterCtrl::onMouseLeave(wxMouseEvent& ev) {
bool FilterCtrl::hasFocus() { bool FilterCtrl::hasFocus() {
wxWindow* focus = wxWindow::FindFocus(); wxWindow* focus = wxWindow::FindFocus();
#if !defined(__WXGTK__)
return focus == this || focus == clear_button; return focus == this || focus == clear_button;
#else
return focus == this;
#endif
} }
void FilterCtrl::showHelp(bool show) { void FilterCtrl::showHelp(bool show) {