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

UnsavedChangesDialog

Browse source 
* Fixed a crash on preset changing and press Cancel button in SavePresetDialog
* Added Cancel button for MessageDialog after check "Remember my choice"

SplashScreen
* Set Version string in respect to the height of a Title string
This commit is contained in:
YuSanka 2020-10-15 19:10:34 +02:00 • committed by Oleksandra Yushchenko
parent 1b2dcabf94
commit 772b0b760e
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/GUI_App.cpp
View file

@ -127,7 +127,7 @@ public:
memDC.SetFont(m_action_font);
memDC.SetTextForeground(wxColour(237, 107, 33));
memDC.DrawText(text, int(m_scale * 55), int(m_scale * 265));
memDC.DrawText(text, int(m_scale * 60), int(m_scale * 275));
memDC.SelectObject(wxNullBitmap);
set_bitmap(bitmap);
@ -185,7 +185,8 @@ public:
wxCoord margin = int(m_scale * 20);
const wxRect banner_rect(wxPoint(0, logo_size + margin * 2), wxPoint(width, bmp.GetHeight()));
wxRect banner_rect(wxPoint(0, logo_size), wxPoint(width, bmp.GetHeight()));
banner_rect.Deflate(margin, 2 * margin);
// use a memory DC to draw directly onto the bitmap
wxMemoryDC memDc(bmp);
@ -197,13 +198,17 @@ public:
memDc.SetTextForeground(wxColour(255, 255, 255));
memDc.SetFont(m_constant_text.title_font);
memDc.DrawLabel(m_constant_text.title, banner_rect.Deflate(margin, 0), wxALIGN_TOP | wxALIGN_LEFT);
memDc.DrawLabel(m_constant_text.title, banner_rect, wxALIGN_TOP | wxALIGN_LEFT);
int title_height = memDc.GetTextExtent(m_constant_text.title).GetY();
banner_rect.SetTop(banner_rect.GetTop() + title_height);
banner_rect.SetHeight(banner_rect.GetHeight() - title_height);
memDc.SetFont(m_constant_text.version_font);
memDc.DrawLabel(m_constant_text.version, banner_rect.Deflate(margin, 3 * margin), wxALIGN_TOP | wxALIGN_LEFT);
memDc.DrawLabel(m_constant_text.version, banner_rect, wxALIGN_TOP | wxALIGN_LEFT);
memDc.SetFont(m_constant_text.credits_font);
memDc.DrawLabel(m_constant_text.credits, banner_rect.Deflate(margin, 2 * margin), wxALIGN_BOTTOM | wxALIGN_LEFT);
memDc.DrawLabel(m_constant_text.credits, banner_rect, wxALIGN_BOTTOM | wxALIGN_LEFT);
}
private:
@ -211,7 +216,7 @@ private:
wxFont m_action_font;
float m_scale {1.0};
struct CONSTANT_TEXT
struct ConstantText
{
wxString title;
wxString version;