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

FIX: messureSize after set max size; the text is the default tooltip

Browse Source 
jira: [STUDIO-11878]
Change-Id: I1945779d620a01fff4cfb29b5592eed0490dbbd5
(cherry picked from commit fba3ab060f5dcfeaf5cc36f14eb5ec46414fdbc8)
This commit is contained in:
xin.zhang
2025-04-27 16:13:57 +08:00
committed by Noisyfox
parent 01ec351df4
commit 50ef04666b
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/Widgets/Button.cpp
View File

@@ -105,6 +105,12 @@ void Button::SetMinSize(const wxSize& size)
messureSize(); messureSize();
} }
void Button::SetMaxSize(const wxSize& size)
{
wxWindow::SetMaxSize(size);
messureSize();
}
void Button::SetPaddingSize(const wxSize& size) void Button::SetPaddingSize(const wxSize& size)
{ {
paddingSize = size; paddingSize = size;
@@ -385,9 +391,15 @@ void Button::messureSize()
if (minSize.GetHeight() > 0) if (minSize.GetHeight() > 0)
size.SetHeight(minSize.GetHeight()); size.SetHeight(minSize.GetHeight());
if (auto w = GetMaxWidth(); w > 0 && size.GetWidth() > w) if (auto w = GetMaxWidth(); w > 0 && size.GetWidth() > w) {
size.SetWidth(GetMaxWidth()); size.SetWidth(GetMaxWidth());
const wxString& tip_str = GetToolTipText();
if (tip_str.IsEmpty()) {
SetToolTip(GetLabel());
}
}
if (minSize.GetWidth() > size.GetWidth()) if (minSize.GetWidth() > size.GetWidth())
wxWindow::SetMinSize(minSize); wxWindow::SetMinSize(minSize);
else else

1
src/slic3r/GUI/Widgets/Button.hpp
View File

@@ -61,6 +61,7 @@ public:
void SetInactiveIcon(const wxString& icon); void SetInactiveIcon(const wxString& icon);
void SetMinSize(const wxSize& size) override; void SetMinSize(const wxSize& size) override;
void SetMaxSize(const wxSize& size) override;
void SetPaddingSize(const wxSize& size); void SetPaddingSize(const wxSize& size);