juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'profile_changes_reset' into updating

Browse Source
This commit is contained in:
Vojtech Kral
2018-04-24 18:15:23 +02:00
parent a50bde4267 7c7c37a4f4
commit 62d67d35ec
28 changed files with 803 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/slic3r/GUI/GUI.cpp
View File

@@ -187,6 +187,7 @@ PresetBundle *g_PresetBundle= nullptr;
PresetUpdater *g_PresetUpdater = nullptr;
wxColour g_color_label_modified;
wxColour g_color_label_sys;
wxColour g_color_label_default;
std::vector<Tab *> g_tabs_list;
@@ -206,6 +207,7 @@ static void init_label_colours()
g_color_label_modified = wxColour(253, 111, 40);
g_color_label_sys = wxColour(115, 220, 103);
}
g_color_label_default = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
}
void set_wxapp(wxApp *app)
@@ -699,6 +701,10 @@ const wxColour& get_sys_label_clr() {
return g_color_label_sys;
}
const wxColour& get_default_label_clr() {
return g_color_label_default;
}
unsigned get_colour_approx_luma(const wxColour &colour)
{
double r = colour.Red();