Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/pstack/gui/controls.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ struct controls {
wxStaticText* min_hole_text;
wxStaticText* minimize_text;
wxSpinCtrl* quantity_spinner;
std::optional<int> quantity_spinner_last_value{ 1 };
wxSpinCtrl* min_hole_spinner;
wxCheckBox* minimize_checkbox;
wxStaticText* rotation_text;
Expand Down
12 changes: 9 additions & 3 deletions src/pstack/gui/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ void main_window::on_select_parts(const std::vector<std::size_t>& indices) {
}
if (quantity.has_value()) {
_controls.quantity_spinner->SetValue(*quantity);
_controls.quantity_spinner_last_value.emplace(*quantity);
} else {
_controls.quantity_spinner->SetValue("");
_controls.quantity_spinner_last_value.reset();
}
if (min_hole.has_value()) {
_controls.min_hole_spinner->SetValue(*min_hole);
Expand Down Expand Up @@ -425,9 +427,13 @@ void main_window::bind_all_controls() {
_controls.sinterbox_result_button->Bind(wxEVT_BUTTON, &main_window::on_sinterbox_result, this);

_controls.quantity_spinner->Bind(wxEVT_SPINCTRL, [this](wxSpinEvent& event) {
for (auto& current_part : _current_parts) {
current_part.part->quantity = event.GetPosition();
_parts_list.reload_quantity(current_part.index);
if (not _controls.quantity_spinner_last_value.has_value() and event.GetPosition() == 0) {
_controls.quantity_spinner->SetValue("");
} else {
for (auto& current_part : _current_parts) {
current_part.part->quantity = event.GetPosition();
_parts_list.reload_quantity(current_part.index);
}
}
event.Skip();
});
Expand Down