juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match titlebar font on Linux (#12828)

Browse Source 
* Update BBLTopbar.cpp

* Update BBLTopbar.cpp

* Update BBLTopbar.cpp

* Update BBLTopbar.cpp
This commit is contained in:
yw4z
2026-05-18 00:43:22 +03:00
committed by GitHub
parent d52d0a082d
commit 6cf7db1ded
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/BBLTopbar.cpp
View File

@@ -58,7 +58,7 @@ CenteredTitle::CenteredTitle(wxWindow* parent)
wxRect rect = GetClientRect(); wxRect rect = GetClientRect();
wxString ellipsized = wxControl::Ellipsize(m_title, dc, wxELLIPSIZE_END, wxMax(0, rect.GetWidth() - FromDIP(8))); wxString ellipsized = wxControl::Ellipsize(m_title, dc, wxELLIPSIZE_END, wxMax(0, rect.GetWidth() - FromDIP(8)));
int y = rect.y + (rect.height - textHeight) / 2; int y = rect.y + (rect.height - textHeight) / 2 + 1;
int x = rect.x + ((ellipsized != m_title) // is ellipsized int x = rect.x + ((ellipsized != m_title) // is ellipsized
? FromDIP(4) // align to left when clipped ? FromDIP(4) // align to left when clipped
: (rect.width - dc.GetTextExtent(m_title).GetWidth()) / 2); // centered when has available space : (rect.width - dc.GetTextExtent(m_title).GetWidth()) / 2); // centered when has available space
@@ -115,15 +115,14 @@ void BBLTopbarArt::DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect)
void BBLTopbarArt::DrawButton(wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect) void BBLTopbarArt::DrawButton(wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& item, const wxRect& rect)
{ {
int textWidth = 0, textHeight = 0; int textWidth = 0, textHeight = 0;
wxFontMetrics fm;
if (m_flags & wxAUI_TB_TEXT) if (m_flags & wxAUI_TB_TEXT)
{ {
dc.SetFont(m_font); dc.SetFont(m_font);
int tx, ty; fm = dc.GetFontMetrics();
textHeight = fm.ascent + fm.descent;
dc.GetTextExtent(wxT("ABCDHgj"), &tx, &textHeight); dc.GetTextExtent(item.GetLabel(), &textWidth, nullptr);
textWidth = 0;
dc.GetTextExtent(item.GetLabel(), &textWidth, &ty);
} }
int bmpX = 0, bmpY = 0; int bmpX = 0, bmpY = 0;
@@ -158,9 +157,7 @@ void BBLTopbarArt::DrawButton(wxDC& dc, wxWindow* wnd, const wxAuiToolBarItem& i
(bmpSize.y / 2); (bmpSize.y / 2);
textX = bmpX + wnd->FromDIP(3) + bmpSize.x; textX = bmpX + wnd->FromDIP(3) + bmpSize.x;
textY = rect.y + textY = bmpY + bmpSize.y / 2 - textHeight / 2 - fm.externalLeading + 1;
(rect.height / 2) -
(textHeight / 2);
} }
@@ -228,7 +225,9 @@ BBLTopbar::BBLTopbar(wxWindow* pwin, wxFrame* parent)
void BBLTopbar::Init(wxFrame* parent) void BBLTopbar::Init(wxFrame* parent)
{ {
SetArtProvider(new BBLTopbarArt()); auto* art = new BBLTopbarArt();
art->SetFont(Label::Body_12);
SetArtProvider(art);
m_frame = parent; m_frame = parent;
m_skip_popup_file_menu = false; m_skip_popup_file_menu = false;
m_skip_popup_dropdown_menu = false; m_skip_popup_dropdown_menu = false;
@@ -321,6 +320,7 @@ void BBLTopbar::Init(wxFrame* parent)
//this->AddStretchSpacer(1); //this->AddStretchSpacer(1);
m_title_ctrl = new CenteredTitle(this); m_title_ctrl = new CenteredTitle(this);
m_title_ctrl->SetFont(Label::Body_12);
wxAuiToolBarItem* title_item = this->AddControl(m_title_ctrl, ""); wxAuiToolBarItem* title_item = this->AddControl(m_title_ctrl, "");
title_item->SetProportion(1); title_item->SetProportion(1);