viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Improvements / Fixes for RadioGroup and apply to more windows II (#10089)

Browse Source 
* init

* Fix issue that `Button` is not focusable on Linux

See: https://github.com/SoftFever/OrcaSlicer/pull/10089#issuecomment-3065050902

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
This commit is contained in:
yw4z
2025-07-12 14:26:47 +03:00
committed by GitHub
parent eba08bf727
commit b410154cb3
7 changed files with 155 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@
#include "ParamsDialog.hpp"
#include "Widgets/Label.hpp"
#include "Widgets/RoundedRectangle.hpp"
#include "Widgets/RadioBox.hpp"
#include "Widgets/RadioGroup.hpp"
#include "Widgets/CheckBox.hpp"
#include "Widgets/Button.hpp"
@@ -10744,23 +10744,12 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path)
return true;
}
class RadioBox;
class RadioSelector
{
public:
int m_select_id;
int m_groupid;
RadioBox *m_radiobox;
};
WX_DECLARE_LIST(RadioSelector, RadioSelectorList);
#define PROJECT_DROP_DIALOG_SELECT_PLANE_SIZE wxSize(FromDIP(350), FromDIP(120))
class ProjectDropDialog : public DPIDialog
{
private:
wxColour m_def_color = wxColour(255, 255, 255);
RadioSelectorList m_radio_group;
int m_action{1};
bool m_remember_choice{false};
@@ -10773,12 +10762,9 @@ public:
wxStaticText *m_fname_s;
StaticBox * m_panel_select;
void select_radio(int index);
void on_select_radio(wxMouseEvent &event);
void on_select_ok(wxCommandEvent &event);
void on_select_cancel(wxCommandEvent &event);
int get_select_radio(int groupid);
int get_action() const { return m_action; }
void set_action(int index) { m_action = index; }
@@ -10796,6 +10782,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
wxDefaultPosition,
wxDefaultSize,
wxCAPTION | wxCLOSE_BOX)
, m_action(2)
{
// def setting
SetBackgroundColour(m_def_color);
@@ -10818,7 +10805,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
m_fname_title = new wxStaticText(this, wxID_ANY, _L("Please select an action"), wxDefaultPosition, wxDefaultSize, 0);
m_fname_title->Wrap(-1);
m_fname_title->SetFont(::Label::Body_13);
m_fname_title->SetFont(::Label::Body_14);
m_fname_title->SetForegroundColour(wxColour(107, 107, 107));
m_fname_title->SetBackgroundColour(wxColour(255, 255, 255));
@@ -10826,7 +10813,7 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
m_sizer_fline->Add(0, 0, 0, wxEXPAND | wxLEFT, 5);
m_fname_f = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
m_fname_f->SetFont(::Label::Head_13);
m_fname_f->SetFont(::Label::Head_14);
m_fname_f->Wrap(-1);
m_fname_f->SetForegroundColour(wxColour(38, 46, 48));
@@ -10835,43 +10822,25 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
m_sizer_name->Add(m_sizer_fline, 1, wxEXPAND, 0);
m_fname_s = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
m_fname_s->SetFont(::Label::Head_13);
m_fname_s->SetFont(::Label::Head_14);
m_fname_s->Wrap(-1);
m_fname_s->SetForegroundColour(wxColour(38, 46, 48));
m_sizer_name->Add(m_fname_s, 1, wxALL, 0);
m_sizer_main->Add(m_sizer_name, 1, wxEXPAND | wxLEFT | wxRIGHT, 40);
m_sizer_main->Add(m_sizer_name, 1, wxEXPAND | wxLEFT | wxRIGHT, 20);
m_sizer_main->Add(0, 0, 0, wxEXPAND | wxTOP, 5);
auto radio_group = new RadioGroup(this, {
_L("Open as project"), // 0
_L("Import geometry only") // 1
}, wxVERTICAL);
radio_group->SetMinSize(wxSize(FromDIP(300),-1));
radio_group->SetSelection(get_action() - 1);
radio_group->Bind(wxEVT_COMMAND_RADIOBOX_SELECTED, [this, radio_group](wxCommandEvent &e) {
set_action(radio_group->GetSelection() + 1);
});
m_panel_select = new StaticBox(this, wxID_ANY, wxDefaultPosition, PROJECT_DROP_DIALOG_SELECT_PLANE_SIZE);
StateColor box_colour(std::pair<wxColour, int>(wxColour("#F8F8F8"), StateColor::Normal));
StateColor box_border_colour(std::pair<wxColour, int>(wxColour(*wxWHITE), StateColor::Normal));
m_panel_select->SetBackgroundColor(box_colour);
m_panel_select->SetBorderColor(box_border_colour);
m_panel_select->SetCornerRadius(5);
wxBoxSizer *m_sizer_select_h = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer *m_sizer_select_v = new wxBoxSizer(wxVERTICAL);
auto select_f = create_item_radiobox(_L("Open as project"), m_panel_select, 1, 0);
auto select_s = create_item_radiobox(_L("Import geometry only"), m_panel_select, 2, 0);
//auto select_t = create_item_radiobox(_L("Import presets only"), m_panel_select,3, 0);
m_sizer_select_v->Add(select_f, 0, wxEXPAND, 5);
m_sizer_select_v->Add(select_s, 0, wxEXPAND, 5);
//m_sizer_select_v->Add(select_t, 0, wxEXPAND, 5);
select_radio(2);
m_sizer_select_h->Add(m_sizer_select_v, 0, wxALIGN_CENTER | wxLEFT, 22);
m_panel_select->SetSizer(m_sizer_select_h);
m_panel_select->Layout();
m_sizer_main->Add(m_panel_select, 0, wxEXPAND | wxLEFT | wxRIGHT, 40);
m_sizer_main->Add(radio_group, 0, wxEXPAND | wxLEFT | wxRIGHT, 20);
m_sizer_main->Add(0, 0, 0, wxEXPAND | wxTOP, 10);
@@ -10923,34 +10892,6 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
wxGetApp().UpdateDlgDarkUI(this);
}
wxBoxSizer *ProjectDropDialog ::create_item_radiobox(wxString title, wxWindow *parent, int select_id, int groupid)
{
wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
auto radiobox = new RadioBox(parent);
radiobox->SetBackgroundColour(wxColour(248,248,248));
sizer->Add(radiobox, 0, wxALL, 5);
sizer->Add(0, 0, 0, wxEXPAND | wxLEFT, 5);
auto text = new wxStaticText(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, 0);
text->Wrap(-1);
text->SetForegroundColour(wxColour(107, 107, 107));
text->SetBackgroundColour(wxColour(248,248,248));
sizer->Add(text, 0, wxALL, 5);
radiobox->Bind(wxEVT_LEFT_DOWN, &ProjectDropDialog::on_select_radio, this);
text->Bind(wxEVT_LEFT_DOWN, [this, radiobox](auto &e) {
e.SetId(radiobox->GetId());
on_select_radio(e);
});
RadioSelector *rs = new RadioSelector;
rs->m_groupid = groupid;
rs->m_radiobox = radiobox;
rs->m_select_id = select_id;
m_radio_group.Append(rs);
return sizer;
}
wxBoxSizer *ProjectDropDialog::create_remember_checkbox(wxString title, wxWindow *parent, wxString tooltip)
{
wxBoxSizer *m_sizer_checkbox = new wxBoxSizer(wxHORIZONTAL);
@@ -10977,63 +10918,6 @@ wxBoxSizer *ProjectDropDialog::create_remember_checkbox(wxString title, wxWindow
return m_sizer_checkbox;
}
void ProjectDropDialog::select_radio(int index)
{
m_action = index;
RadioSelectorList::compatibility_iterator it = m_radio_group.GetFirst();
auto groupid = 0;
while (it) {
RadioSelector *rs = it->GetData();
if (rs->m_select_id == index) groupid = rs->m_groupid;
it = it->GetNext();
}
it = m_radio_group.GetFirst();
while (it) {
RadioSelector *rs = it->GetData();
if (rs->m_groupid == groupid && rs->m_select_id == index) rs->m_radiobox->SetValue(true);
if (rs->m_groupid == groupid && rs->m_select_id != index) rs->m_radiobox->SetValue(false);
it = it->GetNext();
}
}
int ProjectDropDialog::get_select_radio(int groupid)
{
RadioSelectorList::compatibility_iterator it = m_radio_group.GetFirst();
while (it) {
RadioSelector *rs = it->GetData();
if (rs->m_groupid == groupid && rs->m_radiobox->GetValue()) { return rs->m_select_id; }
it = it->GetNext();
}
return 0;
}
void ProjectDropDialog::on_select_radio(wxMouseEvent &event)
{
RadioSelectorList::compatibility_iterator it = m_radio_group.GetFirst();
auto groupid = 0;
while (it) {
RadioSelector *rs = it->GetData();
if (rs->m_radiobox->GetId() == event.GetId()) groupid = rs->m_groupid;
it = it->GetNext();
}
it = m_radio_group.GetFirst();
while (it) {
RadioSelector *rs = it->GetData();
if (rs->m_groupid == groupid && rs->m_radiobox->GetId() == event.GetId()) {
set_action(rs->m_select_id);
rs->m_radiobox->SetValue(true);
}
if (rs->m_groupid == groupid && rs->m_radiobox->GetId() != event.GetId()) rs->m_radiobox->SetValue(false);
it = it->GetNext();
}
}
void ProjectDropDialog::on_select_ok(wxCommandEvent &event)
{
if (m_remember_choice) {