3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-26 01:28:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into dev/bbl-network-upd

Browse source
This commit is contained in:
Noisyfox 2025-06-01 22:51:13 +08:00 • committed by GitHub
commit b01ccc8def
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/slic3r/GUI/Auxiliary.cpp
View file

@ -1083,6 +1083,7 @@ void AuxiliaryPanel::update_all_cover()
wxBoxSizer *m_sizer_license = new wxBoxSizer(wxHORIZONTAL);
auto m_text_license = new wxStaticText(this, wxID_ANY, _L("License"), wxDefaultPosition, wxSize(180, -1), 0);
m_text_license->SetForegroundColour(*wxBLACK);
m_text_license->Wrap(-1);
m_sizer_license->Add(m_text_license, 0, wxALIGN_CENTER, 0);
m_combo_license = new ComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(450), -1), 0, NULL, wxCB_READONLY);

2
src/slic3r/GUI/ImageGrid.cpp
View file

@ -12,7 +12,7 @@
wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)
BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxWindow)
EVT_MOTION(Slic3r::GUI::ImageGrid::mouseMoved)
EVT_ENTER_WINDOW(Slic3r::GUI::ImageGrid::mouseEnterWindow)

2
src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
View file

@ -14,7 +14,7 @@ static const wxColour text_num_color = wxColour(0x898989);
static const wxColour BUTTON_PRESS_COL = wxColour(172, 172, 172);
static const double sqrt2 = std::sqrt(2);
BEGIN_EVENT_TABLE(AxisCtrlButton, wxPanel)
BEGIN_EVENT_TABLE(AxisCtrlButton, wxWindow)
EVT_LEFT_DOWN(AxisCtrlButton::mouseDown)
EVT_LEFT_UP(AxisCtrlButton::mouseReleased)
EVT_MOTION(AxisCtrlButton::mouseMoving)

2
src/slic3r/GUI/Widgets/ProgressBar.cpp
View file

@ -7,7 +7,7 @@
wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
BEGIN_EVENT_TABLE(ProgressBar, wxPanel)
BEGIN_EVENT_TABLE(ProgressBar, wxWindow)
EVT_PAINT(ProgressBar::paintEvent)
END_EVENT_TABLE()

2
src/slic3r/GUI/Widgets/RoundedRectangle.cpp
View file

@ -3,7 +3,7 @@
#include <wx/dcgraph.h>
#include <wx/dcclient.h>
BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)
BEGIN_EVENT_TABLE(RoundedRectangle, wxWindow)
EVT_PAINT(RoundedRectangle::OnPaint)
END_EVENT_TABLE()

2
src/slic3r/GUI/Widgets/SideButton.cpp
View file

@ -4,7 +4,7 @@
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(SideButton, wxPanel)
BEGIN_EVENT_TABLE(SideButton, wxWindow)
EVT_LEFT_DOWN(SideButton::mouseDown)
EVT_LEFT_UP(SideButton::mouseReleased)
EVT_PAINT(SideButton::paintEvent)

2
src/slic3r/GUI/Widgets/SpinInput.cpp
View file

@ -5,7 +5,7 @@
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(SpinInput, wxPanel)
BEGIN_EVENT_TABLE(SpinInput, StaticBox)
EVT_KEY_DOWN(SpinInput::keyPressed)
//EVT_MOUSEWHEEL(SpinInput::mouseWheelMoved)

2
src/slic3r/GUI/Widgets/TempInput.cpp
View file

@ -8,7 +8,7 @@
wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
BEGIN_EVENT_TABLE(TempInput, wxPanel)
BEGIN_EVENT_TABLE(TempInput, StaticBox)
EVT_MOTION(TempInput::mouseMoved)
EVT_ENTER_WINDOW(TempInput::mouseEnterWindow)
EVT_LEAVE_WINDOW(TempInput::mouseLeaveWindow)

2
src/slic3r/GUI/Widgets/TextInput.cpp
View file

@ -6,7 +6,7 @@
#include <wx/dcclient.h>
#include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(TextInput, wxPanel)
BEGIN_EVENT_TABLE(TextInput, StaticBox)
EVT_PAINT(TextInput::paintEvent)