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

simplify solution

Browse Source
This commit is contained in:
yw4z
2026-03-11 15:14:21 +03:00
parent 42fa706655
commit ef2f7ca22a
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,31 +48,19 @@ CenteredTitle::CenteredTitle(wxWindow* parent)
dc.SetTextForeground(*wxWHITE);
wxRect rect = GetClientRect();
int clientW = rect.GetWidth();
wxFontMetrics fm = dc.GetFontMetrics();
int textHeight = fm.ascent + fm.descent;
wxFontMetrics fm = dc.GetFontMetrics();
int textHeight = fm.ascent + fm.descent;
int y = rect.y + (rect.height - textHeight) / 2;
wxRect rect = GetClientRect();
int fullW = dc.GetTextExtent(m_title).GetWidth();
int naturalX = rect.x + (clientW - fullW) / 2;
wxString ellipsized = wxControl::Ellipsize(m_title, dc, wxELLIPSIZE_END, rect.GetWidth() - FromDIP(8));
// Only update cached x if the shift exceeds 3px threshold to fix shaky text while resizing window and ellipsizing end
if (m_cachedX == -1 || std::abs(naturalX - m_cachedX) > FromDIP(3)) {
m_cachedX = wxMax(rect.x, naturalX);
m_cachedWidth = fullW;
}
int y = rect.y + (rect.height - textHeight) / 2;
int x = rect.x + (ellipsized != m_title)
? FromDIP(4) // fixed left when clipped
: (rect.width - dc.GetTextExtent(m_title).GetWidth()) / 2; // centered when full
wxString text = m_title;
int availW = clientW - FromDIP(8);
if (fullW > availW) {
int availFromCached = rect.x + clientW - m_cachedX - FromDIP(4);
text = wxControl::Ellipsize(m_title, dc, wxELLIPSIZE_END, wxMax(availFromCached, FromDIP(20)));
}
dc.DrawText(text, m_cachedX, y);
dc.DrawText(ellipsized, x, y);
});
// repaint for Ellipsize
@@ -94,8 +82,6 @@ CenteredTitle::CenteredTitle(wxWindow* parent)
void CenteredTitle::SetTitle(const wxString& title) {
m_title = title;
m_cachedX = -1;
m_cachedWidth = -1;
RefreshRect(GetClientRect());
Update();
}

2
src/slic3r/GUI/BBLTopbar.hpp
View File

@@ -20,8 +20,6 @@ public:
private:
wxString m_title;
mutable int m_cachedX = -1;
mutable int m_cachedWidth = -1;
};
class BBLTopbar : public wxAuiToolBar