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

Application Scaling for MSW: Next big step

Browse source 
- Added rescale() function for the most of controls
 - Created PrusaBitmap and PrusaButton classes like a wrap to wxBitmap and wxButton accordingly
This commit is contained in:
YuSanka 2019-04-13 23:46:52 +02:00
parent a74c608c7a
commit f7ddddcff5
22 changed files with 737 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/slic3r/GUI/wxExtensions.hpp
View file

@ -882,18 +882,79 @@ private:
};
// ----------------------------------------------------------------------------
// PrusaBitmap
// ----------------------------------------------------------------------------
class PrusaBitmap
{
public:
PrusaBitmap() {};
PrusaBitmap( wxWindow *parent, const std::string& icon_name = "");
~PrusaBitmap() {}
void rescale();
const wxBitmap& bmp() const { return m_bmp; }
const std::string& name() const { return m_icon_name; }
private:
wxWindow* m_parent {nullptr};
wxBitmap m_bmp;
std::string m_icon_name = "";
};
// ----------------------------------------------------------------------------
// PrusaButton
// ----------------------------------------------------------------------------
class PrusaButton : public wxButton
{
public:
PrusaButton(){}
PrusaButton(
wxWindow *parent,
wxWindowID id,
const std::string& icon_name = "",
const wxString& label = wxEmptyString,
const wxSize& size = wxDefaultSize,
const wxPoint& pos = wxDefaultPosition,
long style = wxBU_EXACTFIT | wxNO_BORDER);
PrusaButton(
wxWindow *parent,
wxWindowID id,
const PrusaBitmap& bitmap,
const wxString& label = wxEmptyString,
long style = wxBU_EXACTFIT | wxNO_BORDER);
~PrusaButton() {}
void SetBitmap_(const PrusaBitmap& bmp);
void rescale();
private:
wxWindow* m_parent;
std::string m_current_icon_name = "";
};
// ----------------------------------------------------------------------------
// PrusaModeButton
// ----------------------------------------------------------------------------
class PrusaModeButton : public wxButton
class PrusaModeButton : public PrusaButton/*wxButton*/
{
public:
PrusaModeButton(
wxWindow *parent,
wxWindowID id,
const std::string& icon_name = "",
const wxString& mode = wxEmptyString,
const wxBitmap& bmp_on = wxNullBitmap,
const wxSize& size = wxDefaultSize,
const wxPoint& pos = wxDefaultPosition);
~PrusaModeButton() {}
@ -910,8 +971,8 @@ protected:
private:
bool m_is_selected = false;
wxBitmap m_bmp_on;
wxBitmap m_bmp_off;
// wxBitmap m_bmp_on;
// wxBitmap m_bmp_off;
wxString m_tt_selected;
wxString m_tt_focused;
};
@ -930,6 +991,8 @@ public:
void SetMode(const /*ConfigOptionMode*/int mode);
void rescale();
private:
std::vector<PrusaModeButton*> mode_btns;
};
@ -958,8 +1021,5 @@ public:
};
// ******************************* EXPERIMENTS **********************************************
// ******************************************************************************************
#endif // slic3r_GUI_wxExtensions_hpp_