Add search_ctrl_height()

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 0038a30fbf01945d306ec8c89c1b214463adcda6..c5aea4223e5c62f4c381d16f1f7a1df28785c468 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -47,13 +47,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 {
        auto sizer = new wxBoxSizer (wxVERTICAL);
 
-#ifdef __WXGTK3__
-       int const height = 30;
-#else
-       int const height = -1;
-#endif
-
-       _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, height));
+       _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height()));
 #ifndef __WXGTK3__
        /* The cancel button seems to be strangely broken in GTK3; clicking on it twice sometimes works */
        _search->ShowCancelButton (true);

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 62f00b6b2db39f5132f599152fc1321358aeb953..988adeecc2f64fa0a58f84e4f2a49726d77f8c70 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -688,3 +688,15 @@ dpi_scale_factor (wxWindow*)
 }
 #endif
 
+
+
+int
+search_ctrl_height ()
+{
+#ifdef __WXGTK3__
+       return 30;
+#else
+       return -1;
+#endif
+}
+

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 30e2b739acacd038e8431ca6fcde871ca56aeca3..e9be16b4f8a0f40a23e63e03f066b2949f3817df 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -121,6 +121,7 @@ extern wxString bitmap_path (std::string name);
 extern wxSize small_button_size (wxWindow* parent, wxString text);
 extern bool gui_is_dark ();
 extern double dpi_scale_factor (wxWindow* window);
+extern int search_ctrl_height ();
 
 
 struct Offset