From 3e942c3dc8955be577079fbc028ce216e1c594b2 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 19:07:53 +0800
Subject: [PATCH] Fix numerous bugs (#162)

---
 examples/shared/widgetframe/windowbar.cpp |   68 ++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/examples/shared/widgetframe/windowbar.cpp b/examples/shared/widgetframe/windowbar.cpp
index fba9a49..38a398e 100644
--- a/examples/shared/widgetframe/windowbar.cpp
+++ b/examples/shared/widgetframe/windowbar.cpp
@@ -1,7 +1,12 @@
-#include "WindowBar.h"
-#include "WindowBar_p.h"
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
+#include "windowbar.h"
+#include "windowbar_p.h"
 
 #include <QtCore/QDebug>
+#include <QtCore/QLocale>
 #include <QtGui/QtEvents>
 
 namespace QWK {
@@ -12,13 +17,16 @@
         autoIcon = false;
     }
 
-    WindowBarPrivate::~WindowBarPrivate() {
-    }
+    WindowBarPrivate::~WindowBarPrivate() = default;
 
     void WindowBarPrivate::init() {
         Q_Q(WindowBar);
         layout = new QHBoxLayout();
-        layout->setMargin(0);
+        if (QLocale::system().textDirection() == Qt::RightToLeft) {
+            layout->setDirection(QBoxLayout::RightToLeft);
+        }
+
+        layout->setContentsMargins(QMargins());
         layout->setSpacing(0);
         for (int i = IconButton; i <= CloseButton; ++i) {
             insertDefaultSpace(i);
@@ -54,8 +62,7 @@
     WindowBar::WindowBar(QWidget *parent) : WindowBar(*new WindowBarPrivate(), parent) {
     }
 
-    WindowBar::~WindowBar() {
-    }
+    WindowBar::~WindowBar() = default;
 
     QMenuBar *WindowBar::menuBar() const {
         Q_D(const WindowBar);
@@ -72,14 +79,19 @@
         return static_cast<QAbstractButton *>(d->widgetAt(WindowBarPrivate::IconButton));
     }
 
+    QAbstractButton *WindowBar::pinButton() const {
+        Q_D(const WindowBar);
+        return static_cast<QAbstractButton *>(d->widgetAt(WindowBarPrivate::PinButton));
+    }
+
     QAbstractButton *WindowBar::minButton() const {
         Q_D(const WindowBar);
-        return static_cast<QAbstractButton *>(d->widgetAt(WindowBarPrivate::MinimumButton));
+        return static_cast<QAbstractButton *>(d->widgetAt(WindowBarPrivate::MinimizeButton));
     }
 
     QAbstractButton *WindowBar::maxButton() const {
         Q_D(const WindowBar);
-        return static_cast<QAbstractButton *>(d->widgetAt(WindowBarPrivate::MaximumButton));
+        return static_cast<QAbstractButton *>(d->widgetAt(WindowBarPrivate::MaximizeButton));
     }
 
     QAbstractButton *WindowBar::closeButton() const {
@@ -124,6 +136,17 @@
         btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
     }
 
+    void WindowBar::setPinButton(QAbstractButton *btn) {
+        Q_D(WindowBar);
+        auto org = takePinButton();
+        if (org)
+            org->deleteLater();
+        if (!btn)
+            return;
+        d->setWidgetAt(WindowBarPrivate::PinButton, btn);
+        connect(btn, &QAbstractButton::clicked, this, &WindowBar::pinRequested);
+    }
+
     void WindowBar::setMinButton(QAbstractButton *btn) {
         Q_D(WindowBar);
         auto org = takeMinButton();
@@ -131,7 +154,7 @@
             org->deleteLater();
         if (!btn)
             return;
-        d->setWidgetAt(WindowBarPrivate::MinimumButton, btn);
+        d->setWidgetAt(WindowBarPrivate::MinimizeButton, btn);
         connect(btn, &QAbstractButton::clicked, this, &WindowBar::minimizeRequested);
     }
 
@@ -142,7 +165,7 @@
             org->deleteLater();
         if (!btn)
             return;
-        d->setWidgetAt(WindowBarPrivate::MaximumButton, btn);
+        d->setWidgetAt(WindowBarPrivate::MaximizeButton, btn);
         connect(btn, &QAbstractButton::clicked, this, &WindowBar::maximizeRequested);
     }
 
@@ -172,9 +195,19 @@
         return static_cast<QAbstractButton *>(d->takeWidgetAt(WindowBarPrivate::IconButton));
     }
 
+    QAbstractButton *WindowBar::takePinButton() {
+        Q_D(WindowBar);
+        auto btn = static_cast<QAbstractButton *>(d->takeWidgetAt(WindowBarPrivate::PinButton));
+        if (!btn) {
+            return nullptr;
+        }
+        disconnect(btn, &QAbstractButton::clicked, this, &WindowBar::pinRequested);
+        return btn;
+    }
+
     QAbstractButton *WindowBar::takeMinButton() {
         Q_D(WindowBar);
-        auto btn = static_cast<QAbstractButton *>(d->takeWidgetAt(WindowBarPrivate::MinimumButton));
+        auto btn = static_cast<QAbstractButton *>(d->takeWidgetAt(WindowBarPrivate::MinimizeButton));
         if (!btn) {
             return nullptr;
         }
@@ -184,7 +217,7 @@
 
     QAbstractButton *WindowBar::takeMaxButton() {
         Q_D(WindowBar);
-        auto btn = static_cast<QAbstractButton *>(d->takeWidgetAt(WindowBarPrivate::MaximumButton));
+        auto btn = static_cast<QAbstractButton *>(d->takeWidgetAt(WindowBarPrivate::MaximizeButton));
         if (!btn) {
             return nullptr;
         }
@@ -248,23 +281,26 @@
             QLabel *label = titleLabel();
             QAbstractButton *maxBtn = maxButton();
             switch (event->type()) {
-                case QEvent::WindowIconChange:
+                case QEvent::WindowIconChange: {
                     if (d_ptr->autoIcon && iconBtn) {
                         iconBtn->setIcon(w->windowIcon());
                         iconChanged(w->windowIcon());
                     }
                     break;
-                case QEvent::WindowTitleChange:
+                }
+                case QEvent::WindowTitleChange: {
                     if (d_ptr->autoTitle && label) {
                         label->setText(w->windowTitle());
                         titleChanged(w->windowTitle());
                     }
                     break;
-                case QEvent::WindowStateChange:
+                }
+                case QEvent::WindowStateChange: {
                     if (maxBtn) {
                         maxBtn->setChecked(w->isMaximized());
                     }
                     break;
+                }
                 default:
                     break;
             }

--
Gitblit v1.9.1