diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e0da34e..d582935e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: $CXX --version cmake --version cmake . -DDOWNLOAD_XYLIB=OFF -DDOWNLOAD_LUA=OFF -DDOWNLOAD_ZLIB=OFF - make + make VERBOSE=1 sudo make install - name: test run: | diff --git a/wxgui/cmn.h b/wxgui/cmn.h index e20b45ee..22ffddb3 100644 --- a/wxgui/cmn.h +++ b/wxgui/cmn.h @@ -135,7 +135,7 @@ inline wxSpinCtrl* make_wxspinctrl(wxWindow* parent, wxWindowID id, int val, int min, int max, int width=50) { #ifdef __WXGTK3__ - width += 30; + width = std::max(width, 50) + 30; #endif return new wxSpinCtrl (parent, id, wxString::Format(wxT("%i"), val), wxDefaultPosition, wxSize(width, -1), diff --git a/wxgui/statbar.cpp b/wxgui/statbar.cpp index 2e01a50d..a8159851 100644 --- a/wxgui/statbar.cpp +++ b/wxgui/statbar.cpp @@ -256,7 +256,7 @@ ConfStatBarDlg::ConfStatBarDlg(wxWindow* parent, wxWindowID id, FStatusBar* sb_) gsizer->Add(new wxStaticText(this, -1,wxT("precision")), wxSizerFlags().Align(wxALIGN_CENTRE_VERTICAL|wxALIGN_RIGHT)); - e_prec_sc = make_wxspinctrl(this, -1, sb->e_prec, 0, 9, 40); + e_prec_sc = make_wxspinctrl(this, -1, sb->e_prec, 0, 9); gsizer->Add(e_prec_sc, wxSizerFlags().Align(wxALIGN_CENTRE_VERTICAL)); f_sizer->Add(gsizer, wxSizerFlags(1).Expand().Border());