3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 03:07:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into feature/show-extruder-values-on-filament-overrides-tab

Browse source
This commit is contained in:
Victor Usoltsev 2024-08-28 20:22:40 +12:00 • committed by GitHub
commit b34ac2bda3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
336 changed files with 14249 additions and 11440 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/Field.hpp
View file

@ -512,6 +512,7 @@ public:
TextInput* x_input{nullptr};
TextInput* y_input{nullptr};
wxWindow* window{nullptr};
void BUILD() override;
bool value_was_changed(wxTextCtrl* win);
// Propagate value from field to the OptionGroupe and Config after kill_focus/ENTER
@ -530,7 +531,7 @@ public:
x_textctrl->Disable();
y_textctrl->Disable(); }
wxSizer* getSizer() override { return sizer; }
wxWindow* getWindow() override { return dynamic_cast<wxWindow*>(x_textctrl); }
wxWindow* getWindow() override { return window; }
};
class StaticText : public Field {