Class for RadioGroup & LabeledStaticBox and improvements for Calibration Dialogs, Windows with wxStaticBoxSizer (#9797)

* update * Update calib_dlg.cpp * Update LabeledStaticBox.hpp * Update calib_dlg.cpp * update * update * RadioGroup fix * update * update * update * update * RadioGroup * Fix render issue when position is set to default (-1) * Fix macOS render issue by removing default NSBox border * Fix compile --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2026-06-28 14:41:58 +00:00 · 2025-06-12 15:15:02 +03:00
parent 5c2fe4da87
commit 8fff1caa39
14 changed files with 833 additions and 331 deletions
--- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
+++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp
@@ -0,0 +1,181 @@
+#include "LabeledStaticBox.hpp"
+#include "libslic3r/Utils.hpp"
+#include "../GUI.hpp"
+#include "../GUI_Utils.hpp"
+#include "Label.hpp"
+
+/*
+Fix label overflowing to inner frame
+Fix use elypsis if text too long
+setmin size
+*/
+
+LabeledStaticBox::LabeledStaticBox()
+    : state_handler(this)
+{
+    m_radius       = 3;
+    m_border_width = 1;
+    m_font         = Label::Head_14;
+    text_color = StateColor(
+        std::make_pair(0x363636, (int) StateColor::Normal),
+        std::make_pair(0x6B6B6B, (int) StateColor::Disabled)
+    );
+    background_color = StateColor(
+        std::make_pair(0xFFFFFF, (int) StateColor::Normal),
+        std::make_pair(0xF0F0F1, (int) StateColor::Disabled)
+    );
+    border_color = StateColor(
+        std::make_pair(0xDBDBDB, (int) StateColor::Normal),
+        std::make_pair(0xDBDBDB, (int) StateColor::Disabled)
+    );
+
+}
+
+LabeledStaticBox::LabeledStaticBox(
+    wxWindow*       parent,
+    const wxString& label,
+    const wxPoint&  pos,
+    const wxSize&   size,
+    long            style
+)
+    : LabeledStaticBox()
+{
+    Create(parent, label, pos, size, style);
+}
+
+bool LabeledStaticBox::Create(
+    wxWindow*       parent,
+    const wxString& label,
+    const wxPoint&  pos,
+    const wxSize&   size,
+    long            style
+)
+{
+    if (style & wxBORDER_NONE)
+        m_border_width = 0;
+    wxStaticBox::Create(parent, wxID_ANY, label, pos, size, style);
+#ifdef __WXOSX__
+    Slic3r::GUI::staticbox_remove_margin(this);
+#endif
+
+    m_label = label;
+    m_scale = FromDIP(100) / 100.f;
+    m_pos   = this->GetPosition();
+
+    int tW,tH,descent,externalLeading;
+    GetTextExtent("Yy", &tW, &tH, &descent, &externalLeading, &m_font);
+    m_label_height = tH - externalLeading;
+
+    GetTextExtent(m_label, &tW, &tH, &descent, &externalLeading, &m_font);
+    m_label_width = tW;
+
+    Bind(wxEVT_PAINT,([this](wxPaintEvent e) {
+        wxPaintDC dc(this);
+        PickDC(dc);
+    }));
+
+    state_handler.attach({&text_color, &background_color, &border_color});
+    state_handler.update_binds();
+    #ifndef __WXOSX__
+        SetBackgroundStyle(wxBG_STYLE_PAINT);
+    #endif
+    SetBackgroundColour(background_color.colorForStates(state_handler.states()));
+    SetForegroundColour(      text_color.colorForStates(state_handler.states()));
+    SetBorderColor(         border_color.colorForStates(state_handler.states()));
+    SetCanFocus(false);
+    return true;
+}
+
+void LabeledStaticBox::SetCornerRadius(int radius)
+{
+    this->m_radius = radius;
+    Refresh();
+}
+
+void LabeledStaticBox::SetBorderWidth(int width)
+{
+    this->m_border_width = width;
+    Refresh();
+}
+
+void LabeledStaticBox::SetBorderColor(StateColor const &color)
+{
+    border_color = color;
+    state_handler.update_binds();
+    Refresh();
+}
+
+void LabeledStaticBox::SetFont(wxFont set_font)
+{
+    m_font = set_font;
+    Refresh();
+}
+
+bool LabeledStaticBox::Enable(bool enable)
+{
+    bool result = this->wxStaticBox::Enable(enable);
+    if (result) {
+        wxCommandEvent e(EVT_ENABLE_CHANGED);
+        e.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(e);
+        this->SetForegroundColour(      text_color.colorForStates(state_handler.states()));
+        this->SetBorderColor(         border_color.colorForStates(state_handler.states()));
+    }
+    return result;
+}
+
+void LabeledStaticBox::PickDC(wxDC& dc)
+{
+#ifdef __WXMSW__
+    wxSize size = GetSize();
+    if (size.x <= 0 || size.y <= 0)
+        return;
+    wxMemoryDC memdc(&dc);
+    if (!memdc.IsOk()) {
+        DrawBorderAndLabel(dc);
+        return;
+    }
+    wxBitmap bmp(size.x, size.y);
+    memdc.SelectObject(bmp);
+    memdc.SetBackground(wxBrush(GetBackgroundColour()));
+    memdc.Clear();
+    {
+        wxGCDC dc2(memdc);
+        DrawBorderAndLabel(dc2);
+    }
+
+    memdc.SelectObject(wxNullBitmap);
+    dc.DrawBitmap(bmp, 0, 0);
+#else
+    DrawBorderAndLabel(dc);
+#endif
+}
+
+void LabeledStaticBox::DrawBorderAndLabel(wxDC& dc)
+{
+    // fill full background
+    dc.SetBackground(wxBrush(background_color.colorForStates(0)));
+    dc.Clear();
+
+    wxSize wSz = GetSize();
+
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.SetPen(wxPen(border_color.colorForStates(state_handler.states()), m_border_width, wxSOLID));
+    dc.DrawRoundedRectangle( // Border
+        std::max(0, m_pos.x),
+        std::max(0, m_pos.y) + m_label_height * .5,
+        wSz.GetWidth(),
+        wSz.GetHeight() - m_label_height * .5,
+        m_radius * m_scale
+    );
+
+    if (!m_label.IsEmpty()) {
+        dc.SetFont(m_font);
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(wxBrush(background_color.colorForStates(0)));
+        dc.DrawRectangle(wxRect(7 * m_scale,0 , m_label_width + 7 * m_scale, m_label_height)); // text background
+        // NEEDFIX if text lenght > client size 
+        dc.SetTextForeground(text_color.colorForStates(state_handler.states()));
+        dc.DrawText(m_label, wxPoint(10 * m_scale, 0));
+    }
+}