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

Merge remote-tracking branch 'origin/ys_msw_dpi'

Browse source
This commit is contained in:
YuSanka 2019-04-24 23:09:50 +02:00
commit be60f0a53c
51 changed files with 1742 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/ConfigWizard_private.hpp
View file

@ -210,6 +210,7 @@ public:
void go_to(ConfigWizardPage *page);
void clear();
void rescale();
int em() const { return em_w; }
private:
@ -224,18 +225,27 @@ private:
int em_w;
int em_h;
/* #ys_FIXME_delete_after_testing by VK
const wxBitmap bg;
const wxBitmap bullet_black;
const wxBitmap bullet_blue;
const wxBitmap bullet_white;
*/
PrusaBitmap bg;
PrusaBitmap bullet_black;
PrusaBitmap bullet_blue;
PrusaBitmap bullet_white;
wxStaticBitmap* logo;
std::vector<Item> items;
size_t item_active;
ssize_t item_hover;
size_t last_page;
/* #ys_FIXME_delete_after_testing by VK
int item_height() const { return std::max(bullet_black.GetSize().GetHeight(), em_w) + em_w; }
*/
int item_height() const { return std::max(bullet_black.bmp().GetSize().GetHeight(), em_w) + em_w; }
void on_paint(wxPaintEvent &evt);
void on_mouse_move(wxMouseEvent &evt);