3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for #8693 - GUI: Layout of "Object Manipulation"-Panel is broken (Linux GTK3)

Browse Source
This commit is contained in:
YuSanka 2022-08-24 11:03:11 +02:00
parent abbc99924e
commit 8443e763c7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -257,9 +257,9 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
// axis_name->SetForegroundColour(wxColour(axes_color_text[axis_idx])); // axis_name->SetForegroundColour(wxColour(axes_color_text[axis_idx]));
sizer = new wxBoxSizer(wxHORIZONTAL); sizer = new wxBoxSizer(wxHORIZONTAL);
// Under OSX we use font, smaller than default font, so // Under OSX or Linux with GTK3 we use font, smaller than default font, so
// there is a next trick for an equivalent layout of coordinates combobox and axes labels in they own sizers // there is a next trick for an equivalent layout of coordinates combobox and axes labels in they own sizers
if (wxOSX) if (wxOSX || wxGTK3)
sizer->SetMinSize(-1, m_word_local_combo->GetBestHeight(-1)); sizer->SetMinSize(-1, m_word_local_combo->GetBestHeight(-1));
sizer->Add(axis_name, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, border); sizer->Add(axis_name, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, border);

5
src/slic3r/GUI/OptionsGroup.hpp
View File

@ -18,6 +18,11 @@
#define wxOSX true #define wxOSX true
#else #else
#define wxOSX false #define wxOSX false
#endif
#ifdef __WXGTK3__
#define wxGTK3 true
#else
#define wxGTK3 false
#endif #endif
#define BORDER(a, b) ((wxOSX ? a : b)) #define BORDER(a, b) ((wxOSX ? a : b))

6
src/slic3r/GUI/Plater.cpp
View File

@ -867,11 +867,7 @@ Sidebar::Sidebar(Plater *parent)
if (p->mode_sizer) if (p->mode_sizer)
scrolled_sizer->Add(p->mode_sizer, 0, wxALIGN_CENTER_HORIZONTAL); scrolled_sizer->Add(p->mode_sizer, 0, wxALIGN_CENTER_HORIZONTAL);
#ifdef __WXGTK3__ int size_margin = wxGTK3 ? wxLEFT | wxRIGHT : wxLEFT;
int size_margin = wxLEFT | wxRIGHT;
#else
int size_margin = wxLEFT;
#endif // __WXGTK3__
is_msw ? is_msw ?
scrolled_sizer->Add(p->presets_panel, 0, wxEXPAND | size_margin, margin_5) : scrolled_sizer->Add(p->presets_panel, 0, wxEXPAND | size_margin, margin_5) :