3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix of #6110 - Preview: View Menu/List placement incorrect

Browse source 
Use wxComboBox with wxCB_READONLY flag instead of wxChoice
This commit is contained in:
YuSanka 2021-02-23 10:02:41 +01:00
parent c6d4c85ac4
commit 671efb02c9
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -18,6 +18,7 @@
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/combo.h> #include <wx/combo.h>
#include <wx/combobox.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
// this include must follow the wxWidgets ones or it won't compile on Windows -> see http://trac.wxwidgets.org/ticket/2421 // this include must follow the wxWidgets ones or it won't compile on Windows -> see http://trac.wxwidgets.org/ticket/2421
@ -204,7 +205,7 @@ bool Preview::init(wxWindow* parent, Model* model)
m_bottom_toolbar_panel = new wxPanel(this); m_bottom_toolbar_panel = new wxPanel(this);
m_label_view_type = new wxStaticText(m_bottom_toolbar_panel, wxID_ANY, _L("View")); m_label_view_type = new wxStaticText(m_bottom_toolbar_panel, wxID_ANY, _L("View"));
m_choice_view_type = new wxChoice(m_bottom_toolbar_panel, wxID_ANY); m_choice_view_type = new wxComboBox(m_bottom_toolbar_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
m_choice_view_type->Append(_L("Feature type")); m_choice_view_type->Append(_L("Feature type"));
m_choice_view_type->Append(_L("Height")); m_choice_view_type->Append(_L("Height"));
m_choice_view_type->Append(_L("Width")); m_choice_view_type->Append(_L("Width"));
@ -415,7 +416,7 @@ void Preview::edit_layers_slider(wxKeyEvent& evt)
void Preview::bind_event_handlers() void Preview::bind_event_handlers()
{ {
this->Bind(wxEVT_SIZE, &Preview::on_size, this); this->Bind(wxEVT_SIZE, &Preview::on_size, this);
m_choice_view_type->Bind(wxEVT_CHOICE, &Preview::on_choice_view_type, this); m_choice_view_type->Bind(wxEVT_COMBOBOX, &Preview::on_choice_view_type, this);
m_combochecklist_features->Bind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_features, this); m_combochecklist_features->Bind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_features, this);
m_combochecklist_options->Bind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_options, this); m_combochecklist_options->Bind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_options, this);
m_moves_slider->Bind(wxEVT_SCROLL_CHANGED, &Preview::on_moves_slider_scroll_changed, this); m_moves_slider->Bind(wxEVT_SCROLL_CHANGED, &Preview::on_moves_slider_scroll_changed, this);
@ -424,7 +425,7 @@ void Preview::bind_event_handlers()
void Preview::unbind_event_handlers() void Preview::unbind_event_handlers()
{ {
this->Unbind(wxEVT_SIZE, &Preview::on_size, this); this->Unbind(wxEVT_SIZE, &Preview::on_size, this);
m_choice_view_type->Unbind(wxEVT_CHOICE, &Preview::on_choice_view_type, this); m_choice_view_type->Unbind(wxEVT_COMBOBOX, &Preview::on_choice_view_type, this);
m_combochecklist_features->Unbind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_features, this); m_combochecklist_features->Unbind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_features, this);
m_combochecklist_options->Unbind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_options, this); m_combochecklist_options->Unbind(wxEVT_CHECKLISTBOX, &Preview::on_combochecklist_options, this);
m_moves_slider->Unbind(wxEVT_SCROLL_CHANGED, &Preview::on_moves_slider_scroll_changed, this); m_moves_slider->Unbind(wxEVT_SCROLL_CHANGED, &Preview::on_moves_slider_scroll_changed, this);

4
src/slic3r/GUI/GUI_Preview.hpp
View file

@ -13,7 +13,7 @@ class wxNotebook;
class wxGLCanvas; class wxGLCanvas;
class wxBoxSizer; class wxBoxSizer;
class wxStaticText; class wxStaticText;
class wxChoice; class wxComboBox;
class wxComboCtrl; class wxComboCtrl;
class wxBitmapComboBox; class wxBitmapComboBox;
class wxCheckBox; class wxCheckBox;
@ -82,7 +82,7 @@ class Preview : public wxPanel
wxBoxSizer* m_layers_slider_sizer { nullptr }; wxBoxSizer* m_layers_slider_sizer { nullptr };
wxPanel* m_bottom_toolbar_panel { nullptr }; wxPanel* m_bottom_toolbar_panel { nullptr };
wxStaticText* m_label_view_type { nullptr }; wxStaticText* m_label_view_type { nullptr };
wxChoice* m_choice_view_type { nullptr }; wxComboBox* m_choice_view_type { nullptr };
wxStaticText* m_label_show { nullptr }; wxStaticText* m_label_show { nullptr };
wxComboCtrl* m_combochecklist_features { nullptr }; wxComboCtrl* m_combochecklist_features { nullptr };
size_t m_combochecklist_features_pos { 0 }; size_t m_combochecklist_features_pos { 0 };