mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-19 06:53:02 +00:00
Kris Austin
56f9edc572
* chore: mark every declaration that overrides a base virtual clang-cl reports 42 member functions across 28 files that override a base virtual without being marked `override`, inside classes that already mark their other overrides. That is every occurrence of -Winconsistent-missing-override in the tree, so the category drops to zero and -Werror=inconsistent-missing-override becomes available as a guard against it coming back. Behaviour is unchanged. Each keyword goes only where clang had already resolved the declaration to a base virtual, so it records what the compiler already worked out and cannot affect overload resolution or dispatch. If any of these signatures had not really overridden a base method, the build would have failed rather than warned. Where a declaration already carried `virtual` it is left alone and the keyword appended, matching the surrounding declarations. Plain `override` is used rather than the wxWidgets `wxOVERRIDE` macro, which wx/defs.h defines as `override` beneath a comment marking it obsolete, and which the rest of src/slic3r already avoids by 1742 occurrences to 113. A full clang-cl build takes -Winconsistent-missing-override from 1,146 warning lines to 0. Those 42 declarations produce that many lines because a header is re-diagnosed in every translation unit that includes it. CalibrationWizardStartPage.hpp alone accounts for 336 of them from 4 declarations. * chore: drop unused lambda captures in GUI/Widgets clang-cl reports 10 lambda captures in src/slic3r/GUI/Widgets that are never read. Removing them changes nothing at runtime. Every capture removed is `this` or a raw pointer. clang does not report a capture whose type has a non-trivial destructor, since such a capture can be held purely for its effect on an object's lifetime, so nothing that owns or extends a lifetime is touched. The std::weak_ptr captured beside the removed `this` in MultiNozzleSync.cpp stays. This clears the category in GUI/Widgets only. A full clang-cl build takes -Wunused-lambda-capture from 312 warning lines to 302, leaving 235 sites in other directories for a follow-up.
94 lines
2.1 KiB
C++
94 lines
2.1 KiB
C++
#ifndef slic3r_GUI_SideButton_hpp_
|
|
#define slic3r_GUI_SideButton_hpp_
|
|
|
|
#include <wx/stattext.h>
|
|
#include <wx/vlbox.h>
|
|
#include <wx/combo.h>
|
|
#include "../wxExtensions.hpp"
|
|
#include "StateHandler.hpp"
|
|
|
|
|
|
class SideButton : public wxWindow
|
|
{
|
|
public:
|
|
|
|
enum EHorizontalOrientation : unsigned char
|
|
{
|
|
HO_Left,
|
|
HO_Center,
|
|
HO_Right,
|
|
Num_Horizontal_Orientations
|
|
};
|
|
|
|
SideButton(wxWindow* parent, wxString text, wxString icon = "", long style = 0, int iconSize = 0);
|
|
|
|
void SetCornerRadius(double radius);
|
|
|
|
//BBS set enable array
|
|
void SetCornerEnable(const std::vector<bool>& enable);
|
|
|
|
void SetTextLayout(EHorizontalOrientation orient, int margin = 15);
|
|
|
|
void SetLayoutStyle(int style);
|
|
|
|
void SetLabel(const wxString& label) override;
|
|
|
|
bool SetForegroundColour(wxColour const & colour) override;
|
|
|
|
bool SetBackgroundColour(wxColour const & color) override;
|
|
|
|
bool SetBottomColour(wxColour const &color);
|
|
|
|
void SetMinSize(const wxSize& size) override;
|
|
|
|
void SetBorderColor(StateColor const & color);
|
|
|
|
void SetForegroundColor(StateColor const &color);
|
|
|
|
void SetBackgroundColor(StateColor const &color);
|
|
|
|
bool Enable(bool enable = true) override;
|
|
|
|
void Rescale();
|
|
|
|
void SetExtraSize(const wxSize& size);
|
|
|
|
void SetIconOffset(const int offset);
|
|
|
|
private:
|
|
wxSize textSize;
|
|
wxSize minSize;
|
|
ScalableBitmap icon;
|
|
double radius;
|
|
wxSize extra_size;
|
|
int icon_offset;
|
|
std::vector<bool> radius_enable;
|
|
|
|
StateHandler state_handler;
|
|
StateColor text_color;
|
|
StateColor border_color;
|
|
StateColor background_color;
|
|
wxColour bottom_color;
|
|
|
|
bool pressedDown = false;
|
|
int layout_style = 0;
|
|
|
|
EHorizontalOrientation text_orientation;
|
|
int text_margin;
|
|
|
|
|
|
void paintEvent(wxPaintEvent& evt);
|
|
|
|
void dorender(wxDC& dc, wxDC& text_dc);
|
|
|
|
void messureSize();
|
|
|
|
void mouseDown(wxMouseEvent& event);
|
|
void mouseReleased(wxMouseEvent& event);
|
|
|
|
void sendButtonEvent();
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
};
|
|
#endif // !slic3r_GUI_Button_hpp_
|