Merge branch 'main' into weilun/speed_dial

src/slic3r/GUI/Widgets/Button.cpp

@@ -160,6 +160,15 @@ bool Button::GetValue() const { return state_handler.states() & StateHandler::Ch
 
 void Button::SetCenter(bool isCenter) { this->isCenter = isCenter; }
 
+void Button::SetIndicator(bool on)
+{
+    if (m_show_indicator == on)
+        return;
+    m_show_indicator = on;
+    messureSize();
+    Refresh();
+}
+
 void Button::SetVertical(bool vertical)
 {
     this->vertical = vertical;
@@ -313,6 +322,13 @@ void Button::render(wxDC& dc)
             szContent.x -= d;
         }
     }
+    if (m_show_indicator) {
+        const int dot = FromDIP(6);
+        if (vertical)
+            szContent.y += dot + FromDIP(6);
+        else
+            szContent.x += dot + FromDIP(6);
+    }
     // move to center
     wxRect rcContent = {{0, 0}, size};
     if (isCenter) {
@@ -354,6 +370,17 @@ void Button::render(wxDC& dc)
 #endif
         dc.DrawText(text, pt);
     }
+    if (m_show_indicator) {
+        const int dot = FromDIP(6); // diameter
+        wxPoint dot_pt;
+        dot_pt.x = pt.x + (text.IsEmpty() ? 0 : textSize.x) + FromDIP(6) + dot / 2;
+        // Centre on the content vertically; a bitmap-only (empty-label) tab has no text row.
+        dot_pt.y = text.IsEmpty() ? rcContent.y + rcContent.height / 2 : pt.y + textSize.y / 2;
+        const wxColour c = StateColor::darkModeColorFor(m_indicator_color);
+        dc.SetBrush(wxBrush(c));
+        dc.SetPen(wxPen(c));
+        dc.DrawCircle(dot_pt, dot / 2);
+    }
 }
 
 void Button::messureSize()
@@ -380,6 +407,14 @@ void Button::messureSize()
                 szContent.y = szIcon.y;
         }
     }
+    if (m_show_indicator) {
+        // Indicator dot sits to the right of the label: its diameter plus the gap from the text.
+        const int dot = FromDIP(6);
+        if (vertical)
+            szContent.y += dot + FromDIP(6);
+        else
+            szContent.x += dot + FromDIP(6);
+    }
     wxSize size = szContent + paddingSize * 2;
     if (minSize.GetHeight() > 0)
         size.SetHeight(minSize.GetHeight());

src/slic3r/GUI/Widgets/Button.hpp

@@ -4,6 +4,7 @@
 #include "../wxExtensions.hpp"
 #include "StaticBox.hpp"
 #include <wx/tipwin.h>
+#include <wx/colour.h>
 
 class ButtonProps
 {
@@ -45,6 +46,8 @@ class Button : public StaticBox
     bool canFocus    = true;
     bool isCenter    = true;
     bool vertical    = false;
+    bool m_show_indicator = false;
+    wxColour m_indicator_color = wxColour("#009688");
 
     static const int buttonWidth  = 200;
     static const int buttonHeight = 50;
@@ -78,6 +81,10 @@ public:
 
     void SetSelected(bool selected = true) { m_selected = selected; }
 
+    // Show a small coloured dot to the right of the label (used by TabCtrl tabs to flag that
+    // the tab's category has a selected/toggled setting).
+    void SetIndicator(bool on);
+
     // Only meant to be used by inspector, not public API
     ButtonStyle GetStyle() const { return m_style; }
     ButtonType GetType() const { return m_type; }

src/slic3r/GUI/Widgets/StaticBox.cpp

@@ -7,6 +7,7 @@ BEGIN_EVENT_TABLE(StaticBox, wxWindow)
 
 // catch paint events
 //EVT_ERASE_BACKGROUND(StaticBox::eraseEvent)
+EVT_SIZE(StaticBox::sizeEvent)
 EVT_PAINT(StaticBox::paintEvent)
 
 END_EVENT_TABLE()
@@ -140,6 +141,12 @@ void StaticBox::eraseEvent(wxEraseEvent& evt)
 #endif
 }
 
+void StaticBox::sizeEvent(wxSizeEvent& evt)
+{
+    Refresh();
+    evt.Skip();
+}
+
 void StaticBox::paintEvent(wxPaintEvent& evt)
 {
     // depending on your system you may need to look at double-buffered dcs

src/slic3r/GUI/Widgets/StaticBox.hpp

@@ -46,6 +46,8 @@ public:
 protected:
     void eraseEvent(wxEraseEvent& evt);
 
+    void sizeEvent(wxSizeEvent& evt);
+
     void paintEvent(wxPaintEvent& evt);
 
     void render(wxDC& dc);

src/slic3r/GUI/Widgets/TabCtrl.cpp

@@ -2,8 +2,8 @@
 
 #include <wx/dc.h>
 
-wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGING, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGED, wxCommandEvent );
+wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent);
 
 BEGIN_EVENT_TABLE(TabCtrl, StaticBox)
 
@@ -22,11 +22,7 @@ END_EVENT_TABLE()
 #define TAB_BUTTON_PADDING_Y 2
 #define TAB_BUTTON_PADDING TAB_BUTTON_PADDING_X, TAB_BUTTON_PADDING_Y
 
-TabCtrl::TabCtrl(wxWindow *      parent,
-                   wxWindowID      id,
-                   const wxPoint & pos,
-                   const wxSize &  size,
-                   long            style)
+TabCtrl::TabCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
     : StaticBox(parent, id, pos, size, style)
 {
 #if 0
@@ -42,14 +38,11 @@ TabCtrl::TabCtrl(wxWindow *      parent,
     hsizer->Add(sizer, 0, wxEXPAND | wxBOTTOM, border_width * 4);
     SetSizer(hsizer);
     Bind(wxEVT_COMMAND_BUTTON_CLICKED, &TabCtrl::buttonClicked, this);
-    //wxString reason;
-    //IsTransparentBackgroundSupported(&reason);
+    // wxString reason;
+    // IsTransparentBackgroundSupported(&reason);
 }
 
-TabCtrl::~TabCtrl()
-{
-    delete images;
-}
+TabCtrl::~TabCtrl() { delete images; }
 
 int TabCtrl::GetSelection() const { return sel; }
 
@@ -75,15 +68,13 @@ void TabCtrl::SelectItem(int item)
     Refresh();
 }
 
-void TabCtrl::Unselect()
-{
-    SelectItem(-1);
-}
+void TabCtrl::Unselect() { SelectItem(-1); }
 
 void TabCtrl::Rescale()
 {
-    for (auto & b : btns)
+    for (auto& b : btns)
         b->Rescale();
+    relayout();
 }
 
 bool TabCtrl::SetFont(wxFont const& font)
@@ -95,28 +86,32 @@ bool TabCtrl::SetFont(wxFont const& font)
     return true;
 }
 
-int TabCtrl::AppendItem(const wxString &item,
-                     int image, int selImage,
-                     void * clientData)
+int TabCtrl::AppendItem(const wxString& item, int image, int selImage, void* clientData)
 {
-    Button * btn = new Button();
+    Button* btn = new Button();
     btn->Create(this, item, "", wxBORDER_NONE);
     btn->SetFont(GetFont());
-    btn->SetTextColor(StateColor(
-        std::make_pair(0x6B6B6C, (int) StateColor::NotChecked),
-        std::make_pair(*wxLIGHT_GREY, (int) StateColor::Normal)));
+    btn->SetTextColor(
+        StateColor(std::make_pair(0x6B6B6C, (int) StateColor::NotChecked), std::make_pair(wxColour("#262E30"), (int) StateColor::Normal)));
     btn->SetBackgroundColor(StateColor());
     btn->SetCornerRadius(0);
     btn->SetPaddingSize({TAB_BUTTON_PADDING});
     btns.push_back(btn);
     if (btns.size() > 1)
         sizer->GetItem(sizer->GetItemCount() - 1)->SetMinSize({0, 0});
-    sizer->Add(btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, TAB_BUTTON_SPACE);
+    sizer->Add(btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, item_space);
     sizer->AddStretchSpacer(1);
     relayout();
     return btns.size() - 1;
 }
 
+int TabCtrl::AppendItem(const wxString& item, const wxBitmap& bitmap, void* clientData)
+{
+    const int index = AppendItem(item, -1, -1, clientData);
+    SetItemBitmap(index, bitmap);
+    return index;
+}
+
 bool TabCtrl::DeleteItem(int item)
 {
     if (item < 0 || item >= btns.size()) {
@@ -136,7 +131,7 @@ bool TabCtrl::DeleteItem(int item)
         sizer->GetItem(sizer->GetItemCount() - 1)->SetMinSize({0, 0});
 
     if (selection_changed) {
-        sel--;  // `relayout()` uses `sel` so we need to update this before calling `relayout()`
+        sel--; // `relayout()` uses `sel` so we need to update this before calling `relayout()`
     }
     relayout();
     if (selection_changed) {
@@ -159,75 +154,87 @@ void TabCtrl::DeleteAllItems()
 
 unsigned int TabCtrl::GetCount() const { return btns.size(); }
 
-wxString TabCtrl::GetItemText(unsigned int item) const
+wxString TabCtrl::GetItemText(unsigned int item) const { return item < btns.size() ? btns[item]->GetLabel() : wxString{}; }
+
+void TabCtrl::SetItemText(unsigned int item, wxString const& value)
 {
-    return item < btns.size() ? btns[item]->GetLabel() : wxString{};
+    if (item >= btns.size())
+        return;
+    btns[item]->SetLabel(value);
 }
 
-void TabCtrl::SetItemText(unsigned int item, wxString const &value)
+void TabCtrl::SetItemBitmap(unsigned int item, const wxBitmap& bitmap)
 {
-    if (item >= btns.size()) return;
-    btns[item]->SetLabel(value);
+    if (item >= btns.size())
+        return;
+    btns[item]->SetIcon(bitmap);
+    relayout();
+}
+
+void TabCtrl::SetItemIndicator(unsigned int item, bool on)
+{
+    if (item >= btns.size())
+        return;
+    btns[item]->SetIndicator(on);
+    relayout();
 }
 
 bool TabCtrl::GetItemBold(unsigned int item) const
 {
-    if (item >= btns.size()) return false;
+    if (item >= btns.size())
+        return false;
     return btns[item]->GetFont() == bold;
 }
 
 void TabCtrl::SetItemBold(unsigned int item, bool bold)
 {
-    if (item >= btns.size()) return;
+    if (item >= btns.size())
+        return;
     btns[item]->SetFont(bold ? this->bold : GetFont());
     btns[item]->Rescale();
 }
 
 void* TabCtrl::GetItemData(unsigned int item) const
 {
-    if (item >= btns.size()) return nullptr;
+    if (item >= btns.size())
+        return nullptr;
     return btns[item]->GetClientData();
 }
 
 void TabCtrl::SetItemData(unsigned int item, void* clientData)
 {
-    if (item >= btns.size()) return;
+    if (item >= btns.size())
+        return;
     btns[item]->SetClientData(clientData);
 }
 
 void TabCtrl::AssignImageList(wxImageList* imageList)
 {
-    if (images == imageList) return;
+    if (images == imageList)
+        return;
     delete images;
     images = imageList;
 }
 
-void TabCtrl::SetItemTextColour(unsigned int item, const StateColor &col)
+void TabCtrl::SetItemTextColour(unsigned int item, const StateColor& col)
 {
-    if (item >= btns.size()) return;
+    if (item >= btns.size())
+        return;
     btns[item]->SetTextColor(col);
 }
 
-int TabCtrl::GetFirstVisibleItem() const
-{
-    return btns.size() == 0 ? -1 : 0;
-}
+int TabCtrl::GetFirstVisibleItem() const { return btns.size() == 0 ? -1 : 0; }
 
-int TabCtrl::GetNextVisible(int item) const
-{
-    return ++item < btns.size() ? item : -1;
-}
+int TabCtrl::GetNextVisible(int item) const { return ++item < btns.size() ? item : -1; }
 
-bool TabCtrl::IsVisible(unsigned int item) const
-{
-    return true;
-}
+bool TabCtrl::IsVisible(unsigned int item) const { return true; }
 
 void TabCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     auto size = GetSize();
     wxWindow::DoSetSize(x, y, width, height, sizeFlags);
-    if (size == GetSize()) return;
+    if (size == GetSize())
+        return;
     relayout();
 }
 
@@ -235,7 +242,9 @@ void TabCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
 WXLRESULT TabCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    if (nMsg == WM_GETDLGCODE) { return DLGC_WANTARROWS; }
+    if (nMsg == WM_GETDLGCODE) {
+        return DLGC_WANTARROWS;
+    }
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
@@ -244,15 +253,15 @@ WXLRESULT TabCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 void TabCtrl::relayout()
 {
     int offset = 10;
-    int item = sel + 1;
-    int first = 0;
+    int item   = sel + 1;
+    int first  = 0;
     for (int i = 0; i < item; ++i)
-        offset += btns[i]->GetMinSize().x + TAB_BUTTON_SPACE * 2;
+        offset += btns[i]->GetMinSize().x + item_space * 2;
     if (item < btns.size())
-        offset += btns[item]->GetMinSize().x + TAB_BUTTON_SPACE * 2;
-    int  width = GetSize().x;
+        offset += btns[item]->GetMinSize().x + item_space * 2;
+    int width = GetSize().x;
     for (int i = 0; i < btns.size(); ++i) {
-        auto size = btns[i]->GetMinSize().x + TAB_BUTTON_SPACE * 2;
+        auto size = btns[i]->GetMinSize().x + item_space * 2;
         if (i < sel && offset > width) {
             sizer->Show(i * 2 + 1, false);
             sizer->Show(i * 2 + 2, false);
@@ -273,14 +282,32 @@ void TabCtrl::relayout()
         sizer->GetItem(i * 2 + 2)->SetMinSize({0, 0});
     }
     if (item >= btns.size())
-        -- item;
+        --item;
     // Keep spacing 2 ~ 10 TAB_BUTTON_SPACE
-    int b = GetSize().x - offset - 10 - (item + 1 - first) * TAB_BUTTON_SPACE * 8;
+    int b = GetSize().x - offset - 10 - (item + 1 - first) * item_space * 8;
     sizer->GetItem(item * 2 + 2)->SetMinSize({b > 0 ? b : 0, 0});
     Layout();
 }
 
-void TabCtrl::buttonClicked(wxCommandEvent &event)
+void TabCtrl::SetItemSpace(int space)
+{
+    if (space < 0 || space == item_space)
+        return;
+    item_space = space;
+    relayout();
+    Refresh();
+}
+
+int TabCtrl::GetFullSize() const
+{
+    // Mirrors relayout(): a 10px leading spacer plus every button's min width and spacing.
+    int width = 10;
+    for (const Button* btn : btns)
+        width += btn->GetMinSize().x + item_space * 2;
+    return width;
+}
+
+void TabCtrl::buttonClicked(wxCommandEvent& event)
 {
     SetFocus();
     auto btn  = event.GetEventObject();
@@ -288,7 +315,7 @@ void TabCtrl::buttonClicked(wxCommandEvent &event)
     SelectItem(iter == btns.end() ? -1 : iter - btns.begin());
 }
 
-void TabCtrl::keyDown(wxKeyEvent &event)
+void TabCtrl::keyDown(wxKeyEvent& event)
 {
     switch (event.GetKeyCode()) {
     case WXK_UP:
@@ -307,11 +334,13 @@ void TabCtrl::keyDown(wxKeyEvent &event)
 void TabCtrl::doRender(wxDC& dc)
 {
     wxSize size = GetSize();
-    int states = state_handler.states();
-    if (sel < 0) { return; }
+    int states  = state_handler.states();
+    if (sel < 0) {
+        return;
+    }
 
-    auto x1 = btns[sel]->GetPosition().x;
-    auto x2 = x1 + btns[sel]->GetSize().x;
+    auto x1       = btns[sel]->GetPosition().x;
+    auto x2       = x1 + btns[sel]->GetSize().x;
     const int BS2 = (1 + border_width) / 2;
 #if 0
     const int BS = border_width / 2;

src/slic3r/GUI/Widgets/TabCtrl.hpp

@@ -3,32 +3,30 @@
 
 #include "Button.hpp"
 
-wxDECLARE_EVENT( wxEVT_TAB_SEL_CHANGING, wxCommandEvent );
-wxDECLARE_EVENT( wxEVT_TAB_SEL_CHANGED, wxCommandEvent );
+wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent);
 
 class TabCtrl : public StaticBox
 {
     std::vector<Button*> btns;
     wxImageList* images = nullptr;
-    wxBoxSizer * sizer = nullptr;
+    wxBoxSizer* sizer   = nullptr;
 
     int sel = -1;
     wxFont bold;
+    int item_space = 2; // space around each button, both sides (SetItemSpace)
 
 public:
-    TabCtrl(wxWindow *      parent,
-             wxWindowID      id,
-             const wxPoint & pos       = wxDefaultPosition,
-             const wxSize &  size      = wxDefaultSize,
-             long            style     = 0);
+    TabCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
 
     ~TabCtrl();
 
 public:
-    virtual bool SetFont(wxFont const & font) override;
+    virtual bool SetFont(wxFont const& font) override;
 
 public:
-    int AppendItem(const wxString &item, int image = -1, int selImage = -1, void *clientData = nullptr);
+    int AppendItem(const wxString& item, int image = -1, int selImage = -1, void* clientData = nullptr);
+    int AppendItem(const wxString& item, const wxBitmap& bitmap, void* clientData = nullptr);
 
     bool DeleteItem(int item);
 
@@ -36,7 +34,7 @@ public:
 
     unsigned int GetCount() const;
 
-    int  GetSelection() const;
+    int GetSelection() const;
 
     void SelectItem(int item);
 
@@ -45,15 +43,19 @@ public:
     virtual void Rescale();
 
     wxString GetItemText(unsigned int item) const;
-    void     SetItemText(unsigned int item, wxString const &value);
+    void SetItemText(unsigned int item, wxString const& value);
+    void SetItemBitmap(unsigned int item, const wxBitmap& bitmap);
 
-    bool     GetItemBold(unsigned int item) const;
-    void     SetItemBold(unsigned int item, bool bold);
+    // Show/hide the small "has selection" dot next to a tab's text.
+    void SetItemIndicator(unsigned int item, bool on);
 
-    void*    GetItemData(unsigned int item) const;
-    void     SetItemData(unsigned int item, void *clientData);
-    
-    void AssignImageList(wxImageList *imageList);
+    bool GetItemBold(unsigned int item) const;
+    void SetItemBold(unsigned int item, bool bold);
+
+    void* GetItemData(unsigned int item) const;
+    void SetItemData(unsigned int item, void* clientData);
+
+    void AssignImageList(wxImageList* imageList);
 
     void SetItemTextColour(unsigned int item, const StateColor& col);
 
@@ -62,6 +64,12 @@ public:
     int GetNextVisible(int item) const;
     bool IsVisible(unsigned int item) const;
 
+    // Extra space around each tab button (in px on both sides). Defaults to the control-wide
+    // standard; call before appending items so every button picks it up.
+    void SetItemSpace(int space);
+
+    int GetFullSize() const;
+
 private:
     virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) override;
 
@@ -71,10 +79,10 @@ private:
 
     void relayout();
 
-    void buttonClicked(wxCommandEvent & event);
-    void keyDown(wxKeyEvent &event);
+    void buttonClicked(wxCommandEvent& event);
+    void keyDown(wxKeyEvent& event);
 
-    void doRender(wxDC & dc) override;
+    void doRender(wxDC& dc) override;
 
     // some useful events
     bool sendTabCtrlEvent(bool changing = false);