stdware · wangwenx190 · Feb 11, 2025 · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+   Copyright (C) 2023-2025 Stdware Collections (https://www.github.com/stdware)
    Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
 
    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/README.md b/README.md
@@ -12,9 +12,7 @@ Feature requests are welcome.
 You can share your findings, thoughts and ideas on improving / implementing QWindowKit functionalities on more platforms and apps!
 
 - Chat with us on [Discord](https://discord.gg/grrM4Tmesy)
-  - Please inform us if your product uses QWK, we would like to show it on this README!
 - 中文用户可加入 QQ 群 876419693
-  - 如果您的产品使用了QWK，请告知我们。我们希望在这个自述文件上展示它！
 
 ## Supported Platforms
 

diff --git a/examples/mainwindow/CMakeLists.txt b/examples/mainwindow/CMakeLists.txt
@@ -11,6 +11,4 @@ qwk_add_example(${PROJECT_NAME}
 set_target_properties(${PROJECT_NAME} PROPERTIES
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED TRUE
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
+)
diff --git a/examples/mainwindow/dark-style.qss b/examples/mainwindow/dark-style.qss
@@ -32,9 +32,19 @@ QWK--WindowBar>QAbstractButton[system-button=true] {
     background-color: transparent;
 }
 
+QWK--WindowBar>QAbstractButton#pin-button {
+    qproperty-iconNormal: url(":/window-bar/pin.svg");
+    qproperty-iconChecked: url(":/window-bar/pin-fill.svg");
+    qproperty-iconSize: 15px 15px;
+}
+
+QWK--WindowBar>QAbstractButton#pin-button:hover,
+QWK--WindowBar>QAbstractButton#pin-button:pressed {
+    background-color: rgba(255, 255, 255, 15%);
+}
+
 QWK--WindowBar>QAbstractButton#min-button {
     qproperty-iconNormal: url(":/window-bar/minimize.svg");
-    qproperty-iconSize: 12px 12px;
 }
 
 QWK--WindowBar>QAbstractButton#min-button:hover,

diff --git a/examples/mainwindow/light-style.qss b/examples/mainwindow/light-style.qss
@@ -1,13 +1,13 @@
 /* Window bar */
 
 QWK--WindowBar[bar-active=true] {
-    /*background-color: #195ABE;*/
-    background-color: transparent;
+    background-color: #195ABE;
+    /* background-color: transparent; */
 }
 
 QWK--WindowBar[bar-active=false] {
-    /*background-color: #195ABE;*/
-    background-color: transparent;
+    background-color: #195ABE;
+    /* background-color: transparent; */
 }
 
 
@@ -32,9 +32,19 @@ QWK--WindowBar>QAbstractButton[system-button=true] {
     background-color: transparent;
 }
 
+QWK--WindowBar>QAbstractButton#pin-button {
+    qproperty-iconNormal: url(":/window-bar/pin.svg");
+    qproperty-iconChecked: url(":/window-bar/pin-fill.svg");
+    qproperty-iconSize: 15px 15px;
+}
+
+QWK--WindowBar>QAbstractButton#pin-button:hover,
+QWK--WindowBar>QAbstractButton#pin-button:pressed {
+    background-color: rgba(0, 0, 0, 15%);
+}
+
 QWK--WindowBar>QAbstractButton#min-button {
     qproperty-iconNormal: url(":/window-bar/minimize.svg");
-    qproperty-iconSize: 12px 12px;
 }
 
 QWK--WindowBar>QAbstractButton#min-button:hover,

diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
@@ -188,24 +188,26 @@ void MainWindow::installWindowAgent() {
         winStyleGroup->addAction(acrylicAction);
         winStyleGroup->addAction(micaAction);
         winStyleGroup->addAction(micaAltAction);
-        connect(winStyleGroup, &QActionGroup::triggered, this, [this, winStyleGroup](QAction *action) {
-            // Unset all custom style attributes first, otherwise the style will not display correctly
-            for (const QAction* _act : winStyleGroup->actions()) {
-                const QString data = _act->data().toString();
-                if (data.isEmpty() || data == QStringLiteral("none")) {
-                    continue;
-                }
-                windowAgent->setWindowAttribute(data, false);
-            }
-            const QString data = action->data().toString();
-            if (data == QStringLiteral("none")) {
-                setProperty("custom-style", false);
-            } else if (!data.isEmpty()) {
-                windowAgent->setWindowAttribute(data, true);
-                setProperty("custom-style", true);
-            }
-            style()->polish(this);
-        });
+        connect(winStyleGroup, &QActionGroup::triggered, this,
+                [this, winStyleGroup](QAction *action) {
+                    // Unset all custom style attributes first, otherwise the style will not display
+                    // correctly
+                    for (const QAction *_act : winStyleGroup->actions()) {
+                        const QString data = _act->data().toString();
+                        if (data.isEmpty() || data == QStringLiteral("none")) {
+                            continue;
+                        }
+                        windowAgent->setWindowAttribute(data, false);
+                    }
+                    const QString data = action->data().toString();
+                    if (data == QStringLiteral("none")) {
+                        setProperty("custom-style", false);
+                    } else if (!data.isEmpty()) {
+                        windowAgent->setWindowAttribute(data, true);
+                        setProperty("custom-style", true);
+                    }
+                    style()->polish(this);
+                });
 
 #elif defined(Q_OS_MAC)
         auto darkBlurAction = new QAction(tr("Dark blur"), menuBar);
@@ -283,6 +285,12 @@ void MainWindow::installWindowAgent() {
     iconButton->setObjectName(QStringLiteral("icon-button"));
     iconButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
 
+    auto pinButton = new QWK::WindowButton();
+    pinButton->setCheckable(true);
+    pinButton->setObjectName(QStringLiteral("pin-button"));
+    pinButton->setProperty("system-button", true);
+    pinButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+
     auto minButton = new QWK::WindowButton();
     minButton->setObjectName(QStringLiteral("min-button"));
     minButton->setProperty("system-button", true);
@@ -303,6 +311,7 @@ void MainWindow::installWindowAgent() {
     auto windowBar = new QWK::WindowBar();
 #ifndef Q_OS_MAC
     windowBar->setIconButton(iconButton);
+    windowBar->setPinButton(pinButton);
     windowBar->setMinButton(minButton);
     windowBar->setMaxButton(maxButton);
     windowBar->setCloseButton(closeButton);
@@ -313,6 +322,7 @@ void MainWindow::installWindowAgent() {
 
     windowAgent->setTitleBar(windowBar);
 #ifndef Q_OS_MAC
+    windowAgent->setHitTestVisible(pinButton, true);
     windowAgent->setSystemButton(QWK::WindowAgentBase::WindowIcon, iconButton);
     windowAgent->setSystemButton(QWK::WindowAgentBase::Minimize, minButton);
     windowAgent->setSystemButton(QWK::WindowAgentBase::Maximize, maxButton);
@@ -331,6 +341,14 @@ void MainWindow::installWindowAgent() {
 
 
 #ifndef Q_OS_MAC
+    connect(windowBar, &QWK::WindowBar::pinRequested, this, [this, pinButton](bool pin){
+        if (isHidden() || isMinimized() || isMaximized() || isFullScreen()) {
+            return;
+        }
+        setWindowFlag(Qt::WindowStaysOnTopHint, pin);
+        show();
+        pinButton->setChecked(pin);
+    });
     connect(windowBar, &QWK::WindowBar::minimizeRequested, this, &QWidget::showMinimized);
     connect(windowBar, &QWK::WindowBar::maximizeRequested, this, [this, maxButton](bool max) {
         if (max) {

diff --git a/examples/qml/CMakeLists.txt b/examples/qml/CMakeLists.txt
@@ -11,6 +11,4 @@ qwk_add_example(${PROJECT_NAME}
 set_target_properties(${PROJECT_NAME} PROPERTIES
     CXX_STANDARD 17
     CXX_STANDARD_REQUIRED TRUE
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
+)
diff --git a/examples/qml/QWKButton.qml b/examples/qml/QWKButton.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.15
-import QtQuick.Controls.Basic 2.15
+import QtQuick.Controls 2.15
 
 Button {
     id: root

diff --git a/examples/qml/main.qml b/examples/qml/main.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Window 2.15
-import QtQuick.Controls.Basic 2.15
+import QtQuick.Controls 2.15
 import Qt.labs.platform 1.1
 import QWindowKit 1.0
 
@@ -12,8 +12,8 @@ Window {
     title: qsTr("Hello, world!")
     Component.onCompleted: {
         windowAgent.setup(window)
+        windowAgent.setWindowAttribute("dark-mode", true)
         window.visible = true
-        delayInitTimer.start()
     }
 
     QtObject {
@@ -32,14 +32,6 @@ Window {
         onTriggered: timeLabel.text = Qt.formatTime(new Date(), "hh:mm:ss")
     }
 
-    Timer {
-        id: delayInitTimer
-        interval: 100
-        running: false
-        repeat: false
-        onTriggered: windowAgent.setWindowAttribute("dark-mode", true)
-    }
-
     WindowAgent {
         id: windowAgent
     }

diff --git a/examples/shared/resources/shared.qrc b/examples/shared/resources/shared.qrc
@@ -6,6 +6,8 @@
         <file>window-bar/minimize.svg</file>
         <file>window-bar/restore.svg</file>
         <file>window-bar/more-line.svg</file>
+        <file>window-bar/pin.svg</file>
+        <file>window-bar/pin-fill.svg</file>
         <file>app/example.png</file>
     </qresource>
 </RCC>
diff --git a/examples/shared/resources/window-bar/pin-fill.svg b/examples/shared/resources/window-bar/pin-fill.svg
diff --git a/examples/shared/resources/window-bar/pin.svg b/examples/shared/resources/window-bar/pin.svg
diff --git a/examples/shared/widgetframe/windowbar.cpp b/examples/shared/widgetframe/windowbar.cpp
@@ -79,14 +79,19 @@ namespace QWK {
         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 {
@@ -131,14 +136,25 @@ namespace QWK {
         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();
         if (org)
             org->deleteLater();
         if (!btn)
             return;
-        d->setWidgetAt(WindowBarPrivate::MinimumButton, btn);
+        d->setWidgetAt(WindowBarPrivate::MinimizeButton, btn);
         connect(btn, &QAbstractButton::clicked, this, &WindowBar::minimizeRequested);
     }
 
@@ -149,7 +165,7 @@ namespace QWK {
             org->deleteLater();
         if (!btn)
             return;
-        d->setWidgetAt(WindowBarPrivate::MaximumButton, btn);
+        d->setWidgetAt(WindowBarPrivate::MaximizeButton, btn);
         connect(btn, &QAbstractButton::clicked, this, &WindowBar::maximizeRequested);
     }
 
@@ -179,9 +195,19 @@ namespace QWK {
         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;
         }
@@ -191,7 +217,7 @@ namespace QWK {
 
     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;
         }

diff --git a/examples/shared/widgetframe/windowbar.h b/examples/shared/widgetframe/windowbar.h
@@ -25,20 +25,23 @@ namespace QWK {
         QMenuBar *menuBar() const;
         QLabel *titleLabel() const;
         QAbstractButton *iconButton() const;
+        QAbstractButton *pinButton() const;
         QAbstractButton *minButton() const;
         QAbstractButton *maxButton() const;
         QAbstractButton *closeButton() const;
 
         void setMenuBar(QMenuBar *menuBar);
         void setTitleLabel(QLabel *label);
         void setIconButton(QAbstractButton *btn);
+        void setPinButton(QAbstractButton *btn);
         void setMinButton(QAbstractButton *btn);
         void setMaxButton(QAbstractButton *btn);
         void setCloseButton(QAbstractButton *btn);
 
         QMenuBar *takeMenuBar();
         QLabel *takeTitleLabel();
         QAbstractButton *takeIconButton();
+        QAbstractButton *takePinButton();
         QAbstractButton *takeMinButton();
         QAbstractButton *takeMaxButton();
         QAbstractButton *takeCloseButton();
@@ -53,6 +56,7 @@ namespace QWK {
         void setIconFollowWindow(bool value);
 
     Q_SIGNALS:
+        void pinRequested(bool pin = false);
         void minimizeRequested();
         void maximizeRequested(bool max = false);
         void closeRequested();

diff --git a/examples/shared/widgetframe/windowbar_p.h b/examples/shared/widgetframe/windowbar_p.h
@@ -29,8 +29,9 @@ namespace QWK {
             IconButton,
             MenuWidget,
             TitleLabel,
-            MinimumButton,
-            MaximumButton,
+            PinButton,
+            MinimizeButton,
+            MaximizeButton,
             CloseButton,
         };
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,9 @@
 qm_import(Preprocess)
 
+string(TIMESTAMP _current_year "%Y")
+
 set(QWINDOWKIT_PROJECT_DESCRIPTION "Cross-platform window customization framework")
-set(QWINDOWKIT_PROJECT_COPYRIGHT "Copyright 2023 Stdware Collections")
+set(QWINDOWKIT_PROJECT_COPYRIGHT "Copyright 2023-${_current_year} Stdware Collections")
 set(QWINDOWKIT_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
 set(QWINDOWKIT_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../etc/include)