3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-19 23:01:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

New feature: plate name

Browse source
This commit is contained in:
SoftFever 2023-03-29 21:36:14 +08:00
parent b243bac282
commit f5c4cc9a54
15 changed files with 254 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ wxFont Label::sysFont(int size, bool bold)
}
return font;
}
wxFont Label::Head_48;
wxFont Label::Head_24;
wxFont Label::Head_20;
wxFont Label::Head_18;
@ -64,6 +65,7 @@ void Label::initSysFont()
Head_12 = Label::sysFont(12, true);
Head_10 = Label::sysFont(10, true);
Head_48 = Label::sysFont(48, true);
Body_16 = Label::sysFont(16, false);
Body_15 = Label::sysFont(15, false);
Body_14 = Label::sysFont(14, false);

1
src/slic3r/GUI/Widgets/Label.hpp
View file

@ -35,6 +35,7 @@ public:
static wxFont Head_12;
static wxFont Head_10;
static wxFont Head_48;
static wxFont Body_16;
static wxFont Body_15;
static wxFont Body_14;

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

@ -302,7 +302,7 @@ void TabCtrl::doRender(wxDC& dc)
#else
dc.SetPen(wxPen(border_color.colorForStates(states), border_width));
dc.DrawLine(0, size.y - BS2, size.x, size.y - BS2);
wxColor c(0x42AE00);
wxColor c(0x968800);
dc.SetPen(wxPen(c, 1));
dc.SetBrush(c);
dc.DrawRoundedRectangle(x1 - radius, size.y - BS2 - border_width * 3, x2 + radius * 2 - x1, border_width * 3, radius);