github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

wip: quick: start migrating to modern usage 

Still wip, but doesn't left much.

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-04-14 17:33:09 +08:00
parent d353c81c5e
commit 4f5044a58c
24 changed files with 602 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/quick/CMakeLists.txt
View File

@ -25,22 +25,28 @@
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS QuickControls2)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS QuickControls2)
set(SOURCES
qml.qrc
main.cpp
qt_add_executable(Quick main.cpp)
qt_add_qml_module(Quick
URI Demo
VERSION 1.0
DEPENDENCIES
org.wangwenx190.FramelessHelper
QML_FILES
MainWindow.qml
)
if(WIN32)
enable_language(RC)
list(APPEND SOURCES ../example.rc ../example.manifest)
target_sources(Quick PRIVATE
../example.rc ../example.manifest
)
endif()
add_executable(Quick WIN32 ${SOURCES})
target_link_libraries(Quick PRIVATE
Qt${QT_VERSION_MAJOR}::Quick
Qt${QT_VERSION_MAJOR}::QuickControls2
FramelessHelperQuick
FramelessHelperCore
)
target_compile_definitions(Quick PRIVATE
@ -51,4 +57,13 @@ target_compile_definitions(Quick PRIVATE
QT_DEPRECATED_WARNINGS
QT_DISABLE_DEPRECATED_BEFORE=0x060400
$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
DEMO_IMPORT_DIR="${PROJECT_BINARY_DIR}/imports"
)
set_target_properties(Quick PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER org.wangwenx190.framelesshelper.quick
MACOSX_BUNDLE_BUNDLE_VERSION 1.0.0.0
MACOSX_BUNDLE_SHORT_VERSION_STRING 1.0
MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE
)

0
examples/quick/qml/MainWindow.qml → examples/quick/MainWindow.qml
View File

8
examples/quick/main.cpp
View File

@ -26,7 +26,7 @@
#include <QtQml/qqmlapplicationengine.h>
#include <QtQuick/qquickwindow.h>
#include <QtQuickControls2/qquickstyle.h>
#include <FramelessQuickHelper>
#include <framelesshelpercore_global.h>
FRAMELESSHELPER_USE_NAMESPACE
@ -54,6 +54,7 @@ int main(int argc, char *argv[])
}
QQmlApplicationEngine engine;
engine.addImportPath(QUtf8String(DEMO_IMPORT_DIR));
// This line is not relevant to FramelessHelper, we change the default
// Qt Quick Controls theme to "Basic" (Qt6) or "Default" (Qt5) just
@ -65,10 +66,7 @@ int main(int argc, char *argv[])
QQuickStyle::setStyle(FRAMELESSHELPER_STRING_LITERAL("Default"));
#endif
// VERY IMPORTANT! Don't forget to register the QML types!
FramelessHelper::Quick::registerTypes(&engine);
const QUrl homepageUrl(FRAMELESSHELPER_STRING_LITERAL("qrc:///qml/MainWindow.qml"));
const QUrl homepageUrl(FRAMELESSHELPER_STRING_LITERAL("qrc:///Demo/MainWindow.qml"));
const QMetaObject::Connection connection = QObject::connect(
&engine, &QQmlApplicationEngine::objectCreated, &application,
[&homepageUrl, &connection](QObject *object, const QUrl &url) {

5
examples/quick/qml.qrc
View File

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/">
<file>qml/MainWindow.qml</file>
</qresource>
</RCC>

1
include/FramelessHelper/Quick/FramelessQuickHelper
View File

@ -1 +0,0 @@
#include <framelessquickhelper.h>

2
include/FramelessHelper/Quick/framelessquickutils.h
View File

@ -61,6 +61,8 @@ public:
explicit FramelessQuickUtils(QObject *parent = nullptr);
~FramelessQuickUtils() override;
Q_NODISCARD static FramelessQuickUtils *instance();
Q_NODISCARD static qreal titleBarHeight();
Q_NODISCARD static bool frameBorderVisible();
Q_NODISCARD static qreal frameBorderThickness();

59
src/quick/CMakeLists.txt
View File

@ -22,47 +22,63 @@
SOFTWARE.
]]
set(SUB_PROJ_NAME FramelessHelperQuick)
set(PROJ_TARGET framelesshelperplugin)
set(PROJ_CLASS FramelessHelperPlugin)
set(PROJ_URI org.wangwenx190.FramelessHelper)
set(PROJ_VERSION 1.0)
set(PROJ_IMPORTS_DIR ${PROJECT_BINARY_DIR}/imports/org/wangwenx190/FramelessHelper)
set(INCLUDE_PREFIX ../../include/FramelessHelper/Quick)
set(SOURCES
find_package(Qt6 REQUIRED COMPONENTS QuickTemplates2)
qt_add_qml_module(${PROJ_TARGET}
URI ${PROJ_URI}
VERSION ${PROJ_VERSION}
PLUGIN_TARGET ${PROJ_TARGET}
CLASS_NAME ${PROJ_CLASS}
OUTPUT_DIRECTORY ${PROJ_IMPORTS_DIR}
NO_PLUGIN_OPTIONAL
NO_GENERATE_PLUGIN_SOURCE
SOURCES
${INCLUDE_PREFIX}/framelesshelperquick_global.h
${INCLUDE_PREFIX}/framelessquickutils.h
${INCLUDE_PREFIX}/framelesshelperimageprovider.h
${INCLUDE_PREFIX}/framelessquickhelper.h
${INCLUDE_PREFIX}/framelessquickwindow.h
quickstandardminimizebutton_p.h
quickstandardminimizebutton.cpp
quickstandardmaximizebutton_p.h
quickstandardmaximizebutton.cpp
quickstandardclosebutton_p.h
quickstandardclosebutton.cpp
quickstandardtitlebar_p.h
quickstandardtitlebar.cpp
framelessquickwindow_p.h
framelesshelperquick.qrc
framelessquickhelper.cpp
framelessquickutils.cpp
framelesshelperimageprovider.cpp
framelessquickwindow.cpp
plugin.cpp
)
if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC)
enable_language(RC)
list(APPEND SOURCES framelesshelperquick.rc)
target_sources(${PROJ_TARGET} PRIVATE
framelesshelperquick.rc
)
endif()
if(FRAMELESSHELPER_BUILD_STATIC)
add_library(${SUB_PROJ_NAME} STATIC ${SOURCES})
else()
add_library(${SUB_PROJ_NAME} SHARED ${SOURCES})
endif()
if(FRAMELESSHELPER_BUILD_STATIC)
target_compile_definitions(${SUB_PROJ_NAME} PUBLIC
target_compile_definitions(${PROJ_TARGET} PUBLIC
FRAMELESSHELPER_QUICK_STATIC
)
endif()
target_compile_definitions(${SUB_PROJ_NAME} PRIVATE
target_compile_definitions(${PROJ_TARGET} PRIVATE
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
QT_NO_URL_CAST_FROM_STRING
QT_NO_CAST_FROM_BYTEARRAY
QT_NO_KEYWORDS
#QT_NO_KEYWORDS
QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
QT_NO_FOREACH
QT_USE_QSTRINGBUILDER
@ -74,30 +90,31 @@ target_compile_definitions(${SUB_PROJ_NAME} PRIVATE
if(MSVC)
set(_WIN32_WINNT_WIN10 0x0A00)
set(NTDDI_WIN10_CO 0x0A00000B)
target_compile_definitions(${SUB_PROJ_NAME} PRIVATE
target_compile_definitions(${PROJ_TARGET} PRIVATE
_CRT_NON_CONFORMING_SWPRINTFS _CRT_SECURE_NO_WARNINGS
_ENABLE_EXTENDED_ALIGNED_STORAGE NOMINMAX UNICODE
_UNICODE WIN32_LEAN_AND_MEAN WINRT_LEAN_AND_MEAN
WINVER=${_WIN32_WINNT_WIN10} _WIN32_WINNT=${_WIN32_WINNT_WIN10}
_WIN32_IE=${_WIN32_WINNT_WIN10} NTDDI_VERSION=${NTDDI_WIN10_CO}
)
target_compile_options(${SUB_PROJ_NAME} PRIVATE
target_compile_options(${PROJ_TARGET} PRIVATE
/utf-8 /W4 /WX
)
else()
target_compile_options(${SUB_PROJ_NAME} PRIVATE
target_compile_options(${PROJ_TARGET} PRIVATE
-Wall -Wextra -Werror
)
endif()
target_link_libraries(${SUB_PROJ_NAME} PRIVATE
target_link_libraries(${PROJ_TARGET} PRIVATE
Qt${QT_VERSION_MAJOR}::QuickPrivate
Qt${QT_VERSION_MAJOR}::QuickTemplates2Private
)
target_link_libraries(${SUB_PROJ_NAME} PUBLIC
target_link_libraries(${PROJ_TARGET} PUBLIC
FramelessHelperCore
)
target_include_directories(${SUB_PROJ_NAME} PUBLIC
target_include_directories(${PROJ_TARGET} PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/${INCLUDE_PREFIX}"
)

8
src/quick/framelesshelperquick.qrc
View File

@ -1,8 +0,0 @@
<RCC>
<qresource prefix="/org.wangwenx190.FramelessHelper">
<file>qml/StandardCloseButton.qml</file>
<file>qml/StandardMaximizeButton.qml</file>
<file>qml/StandardMinimizeButton.qml</file>
<file>qml/StandardTitleBar.qml</file>
</qresource>
</RCC>

7
src/quick/framelessquickutils.cpp
View File

@ -34,6 +34,8 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
using namespace Global;
Q_GLOBAL_STATIC(FramelessQuickUtils, g_quickUtils)
FramelessQuickUtils::FramelessQuickUtils(QObject *parent) : QObject(parent)
{
connect(FramelessWindowsManager::instance(), &FramelessWindowsManager::systemThemeChanged, this, [this](){
@ -45,6 +47,11 @@ FramelessQuickUtils::FramelessQuickUtils(QObject *parent) : QObject(parent)
FramelessQuickUtils::~FramelessQuickUtils() = default;
FramelessQuickUtils *FramelessQuickUtils::instance()
{
return g_quickUtils();
}
qreal FramelessQuickUtils::titleBarHeight()
{
return 30.0;

18
src/quick/framelessquickwindow.cpp
View File

@ -49,6 +49,24 @@ FramelessQuickWindowPrivate::FramelessQuickWindowPrivate(FramelessQuickWindow *q
FramelessQuickWindowPrivate::~FramelessQuickWindowPrivate() = default;
FramelessQuickWindowPrivate *FramelessQuickWindowPrivate::get(FramelessQuickWindow *pub)
{
Q_ASSERT(pub);
if (!pub) {
return nullptr;
}
return pub->d_func();
}
const FramelessQuickWindowPrivate *FramelessQuickWindowPrivate::get(const FramelessQuickWindow *pub)
{
Q_ASSERT(pub);
if (!pub) {
return nullptr;
}
return pub->d_func();
}
bool FramelessQuickWindowPrivate::isHidden() const
{
Q_Q(const FramelessQuickWindow);

3
src/quick/framelessquickwindow_p.h
View File

@ -47,6 +47,9 @@ public:
explicit FramelessQuickWindowPrivate(FramelessQuickWindow *q, const Global::UserSettings &settings = {});
~FramelessQuickWindowPrivate() override;
Q_NODISCARD static FramelessQuickWindowPrivate *get(FramelessQuickWindow *pub);
Q_NODISCARD static const FramelessQuickWindowPrivate *get(const FramelessQuickWindow *pub);
Q_INVOKABLE Q_NODISCARD bool isHidden() const;
Q_INVOKABLE Q_NODISCARD bool isNormal() const;
Q_INVOKABLE Q_NODISCARD bool isMinimized() const;

73
src/quick/framelessquickhelper.cpp → src/quick/plugin.cpp
View File

@ -22,17 +22,15 @@
* SOFTWARE.
*/
#include "framelessquickhelper.h"
#include "framelesshelperquick_global.h"
#include <QtQml/qqmlextensionplugin.h>
#include "framelesshelperimageprovider.h"
#include "framelessquickutils.h"
#include "framelessquickwindow.h"
#ifndef QML_URL_EXPAND
# define QML_URL_EXPAND(fileName) \
QUrl(FRAMELESSHELPER_STRING_LITERAL("qrc:///org.wangwenx190.FramelessHelper/qml/%1.qml") \
.arg(FRAMELESSHELPER_STRING_LITERAL(fileName)))
#endif
#include "quickstandardminimizebutton_p.h"
#include "quickstandardmaximizebutton_p.h"
#include "quickstandardclosebutton_p.h"
#include "quickstandardtitlebar_p.h"
#ifndef QUICK_URI_SHORT
# define QUICK_URI_SHORT FRAMELESSHELPER_QUICK_URI, 1
@ -54,31 +52,28 @@
# endif
#endif
#ifndef qmlRegisgerFile
# define qmlRegisterFile(Name) qmlRegisterType(QML_URL_EXPAND(Name), QUICK_URI_EXPAND(Name))
#endif
// The "Q_INIT_RESOURCE()" macro can't be used inside a namespace,
// the official workaround is to wrap it into a global function
// and call the wrapper function inside the namespace.
static inline void initResource()
{
Q_INIT_RESOURCE(framelesshelperquick);
}
FRAMELESSHELPER_BEGIN_NAMESPACE
void FramelessHelper::Quick::registerTypes(QQmlEngine *engine)
class FramelessHelperPlugin : public QQmlEngineExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
public:
explicit FramelessHelperPlugin(QObject *parent = nullptr) : QQmlEngineExtensionPlugin(parent) {}
~FramelessHelperPlugin() override = default;
void initializeEngine(QQmlEngine *engine, const char *uri) override
{
Q_ASSERT(engine);
if (!engine) {
Q_ASSERT(uri);
if (!engine || !uri) {
return;
}
static bool inited = false;
if (inited) {
Q_ASSERT(qstrcmp(uri, FRAMELESSHELPER_QUICK_URI) == 0);
if (qstrcmp(uri, FRAMELESSHELPER_QUICK_URI) != 0) {
return;
}
inited = true;
engine->addImageProvider(FRAMELESSHELPER_STRING_LITERAL("framelesshelper"), new FramelessHelperImageProvider);
qmlRegisterModule(QUICK_URI_FULL);
qmlRegisterUncreatableMetaObject(Global::staticMetaObject, QUICK_URI_EXPAND("FramelessHelper"),
@ -92,33 +87,13 @@ void FramelessHelper::Quick::registerTypes(QQmlEngine *engine)
qmlRegisterAnonymousType2(QWindow, QUICK_URI_SHORT);
qmlRegisterAnonymousType2(QQuickWindow, QUICK_URI_SHORT);
qmlRegisterType<FramelessQuickWindow>(QUICK_URI_EXPAND("FramelessWindow"));
initResource();
qmlRegisterFile("StandardMinimizeButton");
qmlRegisterFile("StandardMaximizeButton");
qmlRegisterFile("StandardCloseButton");
qmlRegisterFile("StandardTitleBar");
}
class FRAMELESSHELPER_QUICK_API FramelessHelperExtensionPlugin : public QQmlEngineExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID QQmlEngineExtensionInterface_iid)
public:
void initializeEngine(QQmlEngine *engine, const char *uri) override
{
Q_ASSERT(engine);
Q_ASSERT(uri);
if (!engine || !uri) {
return;
}
if (qstrcmp(uri, FRAMELESSHELPER_QUICK_URI) != 0) {
return;
}
FramelessHelper::Quick::registerTypes(engine);
qmlRegisterType<QuickStandardMinimizeButton>(QUICK_URI_EXPAND("StandardMinimizeButton"));
qmlRegisterType<QuickStandardMaximizeButton>(QUICK_URI_EXPAND("StandardMaximizeButton"));
qmlRegisterType<QuickStandardCloseButton>(QUICK_URI_EXPAND("StandardCloseButton"));
qmlRegisterType<QuickStandardTitleBar>(QUICK_URI_EXPAND("StandardTitleBar"));
}
};
FRAMELESSHELPER_END_NAMESPACE
#include "framelessquickhelper.moc"
#include "plugin.moc"

59
src/quick/qml/StandardMaximizeButton.qml
View File

@ -1,59 +0,0 @@
/*
* MIT License
*
* Copyright (C) 2022 by wangwenx190 (Yuhang Zhao)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import QtQuick 2.0
import QtQuick.Controls 2.0
import org.wangwenx190.FramelessHelper 1.0
Button {
property bool maximized: false
id: button
objectName: "MaximizeButtonObject"
implicitWidth: FramelessUtils.defaultSystemButtonSize.width
implicitHeight: FramelessUtils.defaultSystemButtonSize.height
contentItem: Item {
implicitWidth: FramelessUtils.defaultSystemButtonIconSize.width
implicitHeight: FramelessUtils.defaultSystemButtonIconSize.height
Image {
anchors.centerIn: parent
source: button.maximized ?
((FramelessUtils.darkModeEnabled || FramelessUtils.titleBarColorized)
? "image://framelesshelper/dark/restore" : "image://framelesshelper/light/restore") :
((FramelessUtils.darkModeEnabled || FramelessUtils.titleBarColorized)
? "image://framelesshelper/dark/maximize" : "image://framelesshelper/light/maximize")
}
}
background: Rectangle {
visible: button.hovered || button.pressed
color: FramelessUtils.getSystemButtonBackgroundColor(FramelessHelper.Maximize, (button.pressed ? FramelessHelper.Pressed : FramelessHelper.Hovered))
}
ToolTip {
visible: button.hovered && !button.pressed
delay: Qt.styleHints.mousePressAndHoldInterval
text: button.maximized ? qsTr("Restore") : qsTr("Maximize")
}
}

74
src/quick/qml/StandardTitleBar.qml
View File

@ -1,74 +0,0 @@
/*
* MIT License
*
* Copyright (C) 2022 by wangwenx190 (Yuhang Zhao)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
import QtQuick 2.0
import QtQuick.Controls 2.0
import org.wangwenx190.FramelessHelper 1.0
Rectangle {
property bool active: true
property bool maximized: false
property alias title: windowTitleLabel.text
property alias minimizeButton: minimizeButton
property alias maximizeButton: maximizeButton
property alias closeButton: closeButton
id: titleBar
height: FramelessUtils.titleBarHeight
color: titleBar.active ? (FramelessUtils.titleBarColorized ? FramelessUtils.systemAccentColor
: (FramelessUtils.darkModeEnabled ? "black" : "white"))
: (FramelessUtils.darkModeEnabled ? FramelessUtils.defaultSystemDarkColor : "white")
Text {
id: windowTitleLabel
font.pointSize: 11
color: titleBar.active ? ((FramelessUtils.darkModeEnabled
|| FramelessUtils.titleBarColorized) ? "white" : "black") : "darkGray"
anchors {
left: parent.left
leftMargin: 10
verticalCenter: parent.verticalCenter
}
}
Row {
anchors {
top: parent.top
right: parent.right
}
StandardMinimizeButton {
id: minimizeButton
}
StandardMaximizeButton {
id: maximizeButton
maximized: titleBar.maximized
}
StandardCloseButton {
id: closeButton
}
}
}

87
src/quick/quickstandardclosebutton.cpp Normal file
View File

@ -0,0 +1,87 @@
/*
* MIT License
*
* Copyright (C) 2022 by wangwenx190 (Yuhang Zhao)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "quickstandardclosebutton_p.h"
#include "framelessquickutils.h"
#include <QtQuick/private/qquickimage_p.h>
#include <QtQuick/private/qquickrectangle_p.h>
#include <QtQuick/private/qquickanchors_p.h>
FRAMELESSHELPER_BEGIN_NAMESPACE
using namespace Global;
FRAMELESSHELPER_STRING_CONSTANT2(DarkUrl, "image://framelesshelper/dark/close")
FRAMELESSHELPER_STRING_CONSTANT2(LightUrl, "image://framelesshelper/light/close")
QuickStandardCloseButton::QuickStandardCloseButton(QQuickItem *parent) : QQuickButton(parent)
{
initialize();
}
QuickStandardCloseButton::~QuickStandardCloseButton() = default;
void QuickStandardCloseButton::updateForeground()
{
const bool dark = (FramelessQuickUtils::darkModeEnabled() || FramelessQuickUtils::titleBarColorized());
const auto url = QUrl(dark ? kDarkUrl : kLightUrl);
m_image->setSource(url);
}
void QuickStandardCloseButton::updateBackground()
{
static constexpr const auto button = SystemButtonType::Close;
const ButtonState state = (isPressed() ? ButtonState::Pressed : ButtonState::Hovered);
const bool visible = (isHovered() || isPressed());
m_backgroundItem->setColor(FramelessQuickUtils::getSystemButtonBackgroundColor(button, state));
m_backgroundItem->setVisible(visible);
}
void QuickStandardCloseButton::initialize()
{
m_contentItem.reset(new QQuickItem(this));
m_contentItem->setImplicitWidth(kDefaultSystemButtonSize.width());
m_contentItem->setImplicitHeight(kDefaultSystemButtonSize.height());
m_image.reset(new QQuickImage(m_contentItem.data()));
const auto imageAnchors = new QQuickAnchors(m_image.data(), m_image.data());
imageAnchors->setCenterIn(m_contentItem.data());
const FramelessQuickUtils * const utils = FramelessQuickUtils::instance();
connect(utils, &FramelessQuickUtils::darkModeEnabledChanged, this, &QuickStandardCloseButton::updateForeground);
connect(utils, &FramelessQuickUtils::titleBarColorizedChanged, this, &QuickStandardCloseButton::updateForeground);
m_backgroundItem.reset(new QQuickRectangle(this));
QQuickPen * const border = m_backgroundItem->border();
border->setWidth(0.0);
border->setColor(kDefaultTransparentColor);
connect(this, &QuickStandardCloseButton::hoveredChanged, this, &QuickStandardCloseButton::updateBackground);
connect(this, &QuickStandardCloseButton::pressedChanged, this, &QuickStandardCloseButton::updateBackground);
updateBackground();
updateForeground();
setContentItem(m_contentItem.data());
setBackground(m_backgroundItem.data());
}
FRAMELESSHELPER_END_NAMESPACE

36
src/quick/framelessquickhelper.h → src/quick/quickstandardclosebutton_p.h
View File

@ -22,4 +22,38 @@
* SOFTWARE.
*/
#include "../../include/FramelessHelper/Quick/framelessquickhelper.h"
#pragma once
#include <QtQuickTemplates2/private/qquickbutton_p.h>
#include "framelesshelperquick_global.h"
QT_BEGIN_NAMESPACE
class QQuickImage;
class QQuickRectangle;
QT_END_NAMESPACE
FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API QuickStandardCloseButton : public QQuickButton
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(QuickStandardCloseButton)
public:
explicit QuickStandardCloseButton(QQuickItem *parent = nullptr);
~QuickStandardCloseButton() override;
public Q_SLOTS:
void updateForeground();
void updateBackground();
private:
void initialize();
private:
QScopedPointer<QQuickItem> m_contentItem;
QScopedPointer<QQuickImage> m_image;
QScopedPointer<QQuickRectangle> m_backgroundItem;
};
FRAMELESSHELPER_END_NAMESPACE

104
src/quick/quickstandardmaximizebutton.cpp Normal file
View File

@ -0,0 +1,104 @@
/*
* MIT License
*
* Copyright (C) 2022 by wangwenx190 (Yuhang Zhao)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "quickstandardmaximizebutton_p.h"
#include "framelessquickutils.h"
#include <QtQuick/private/qquickimage_p.h>
#include <QtQuick/private/qquickrectangle_p.h>
#include <QtQuick/private/qquickanchors_p.h>
FRAMELESSHELPER_BEGIN_NAMESPACE
using namespace Global;
FRAMELESSHELPER_STRING_CONSTANT2(DarkMaxUrl, "image://framelesshelper/dark/maximize")
FRAMELESSHELPER_STRING_CONSTANT2(LightMaxUrl, "image://framelesshelper/light/maximize")
FRAMELESSHELPER_STRING_CONSTANT2(DarkRestoreUrl, "image://framelesshelper/dark/restore")
FRAMELESSHELPER_STRING_CONSTANT2(LightRestoreUrl, "image://framelesshelper/light/restore")
QuickStandardMaximizeButton::QuickStandardMaximizeButton(QQuickItem *parent) : QQuickButton(parent)
{
initialize();
}
QuickStandardMaximizeButton::~QuickStandardMaximizeButton() = default;
bool QuickStandardMaximizeButton::maximized() const
{
return m_max;
}
void QuickStandardMaximizeButton::setMaximized(const bool max)
{
if (m_max == max) {
return;
}
m_max = max;
Q_EMIT maximizedChanged();
}
void QuickStandardMaximizeButton::updateForeground()
{
const bool dark = (FramelessQuickUtils::darkModeEnabled() || FramelessQuickUtils::titleBarColorized());
const auto url = QUrl(dark ? (m_max ? kDarkMaxUrl : kDarkRestoreUrl) : (m_max ? kLightMaxUrl : kLightRestoreUrl));
m_image->setSource(url);
}
void QuickStandardMaximizeButton::updateBackground()
{
const SystemButtonType button = (m_max ? SystemButtonType::Maximize : SystemButtonType::Restore);
const ButtonState state = (isPressed() ? ButtonState::Pressed : ButtonState::Hovered);
const bool visible = (isHovered() || isPressed());
m_backgroundItem->setColor(FramelessQuickUtils::getSystemButtonBackgroundColor(button, state));
m_backgroundItem->setVisible(visible);
}
void QuickStandardMaximizeButton::initialize()
{
m_contentItem.reset(new QQuickItem(this));
m_contentItem->setImplicitWidth(kDefaultSystemButtonSize.width());
m_contentItem->setImplicitHeight(kDefaultSystemButtonSize.height());
m_image.reset(new QQuickImage(m_contentItem.data()));
const auto imageAnchors = new QQuickAnchors(m_image.data(), m_image.data());
imageAnchors->setCenterIn(m_contentItem.data());
const FramelessQuickUtils * const utils = FramelessQuickUtils::instance();
connect(utils, &FramelessQuickUtils::darkModeEnabledChanged, this, &QuickStandardMaximizeButton::updateForeground);
connect(utils, &FramelessQuickUtils::titleBarColorizedChanged, this, &QuickStandardMaximizeButton::updateForeground);
connect(this, &QuickStandardMaximizeButton::maximizedChanged, this, &QuickStandardMaximizeButton::updateForeground);
m_backgroundItem.reset(new QQuickRectangle(this));
QQuickPen * const border = m_backgroundItem->border();
border->setWidth(0.0);
border->setColor(kDefaultTransparentColor);
connect(this, &QuickStandardMaximizeButton::hoveredChanged, this, &QuickStandardMaximizeButton::updateBackground);
connect(this, &QuickStandardMaximizeButton::pressedChanged, this, &QuickStandardMaximizeButton::updateBackground);
updateBackground();
updateForeground();
setContentItem(m_contentItem.data());
setBackground(m_backgroundItem.data());
}
FRAMELESSHELPER_END_NAMESPACE

67
src/quick/qml/StandardMinimizeButton.qml → src/quick/quickstandardmaximizebutton_p.h
View File

@ -22,33 +22,46 @@
* SOFTWARE.
*/
import QtQuick 2.0
import QtQuick.Controls 2.0
import org.wangwenx190.FramelessHelper 1.0
#pragma once
Button {
id: button
objectName: "MinimizeButtonObject"
implicitWidth: FramelessUtils.defaultSystemButtonSize.width
implicitHeight: FramelessUtils.defaultSystemButtonSize.height
contentItem: Item {
implicitWidth: FramelessUtils.defaultSystemButtonIconSize.width
implicitHeight: FramelessUtils.defaultSystemButtonIconSize.height
#include <QtQuickTemplates2/private/qquickbutton_p.h>
#include "framelesshelperquick_global.h"
Image {
anchors.centerIn: parent
source: (FramelessUtils.darkModeEnabled || FramelessUtils.titleBarColorized)
? "image://framelesshelper/dark/minimize" : "image://framelesshelper/light/minimize"
}
}
background: Rectangle {
visible: button.hovered || button.pressed
color: FramelessUtils.getSystemButtonBackgroundColor(FramelessHelper.Minimize, (button.pressed ? FramelessHelper.Pressed : FramelessHelper.Hovered))
}
QT_BEGIN_NAMESPACE
class QQuickImage;
class QQuickRectangle;
QT_END_NAMESPACE
ToolTip {
visible: button.hovered && !button.pressed
delay: Qt.styleHints.mousePressAndHoldInterval
text: qsTr("Minimize")
}
}
FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API QuickStandardMaximizeButton : public QQuickButton
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(QuickStandardMaximizeButton)
Q_PROPERTY(bool maximized READ maximized WRITE setMaximized NOTIFY maximizedChanged FINAL)
public:
explicit QuickStandardMaximizeButton(QQuickItem *parent = nullptr);
~QuickStandardMaximizeButton() override;
Q_NODISCARD bool maximized() const;
void setMaximized(const bool max);
public Q_SLOTS:
void updateForeground();
void updateBackground();
Q_SIGNALS:
void maximizedChanged();
private:
void initialize();
private:
bool m_max = false;
QScopedPointer<QQuickItem> m_contentItem;
QScopedPointer<QQuickImage> m_image;
QScopedPointer<QQuickRectangle> m_backgroundItem;
};
FRAMELESSHELPER_END_NAMESPACE

87
src/quick/quickstandardminimizebutton.cpp Normal file
View File

@ -0,0 +1,87 @@
/*
* MIT License
*
* Copyright (C) 2022 by wangwenx190 (Yuhang Zhao)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "quickstandardminimizebutton_p.h"
#include "framelessquickutils.h"
#include <QtQuick/private/qquickimage_p.h>
#include <QtQuick/private/qquickrectangle_p.h>
#include <QtQuick/private/qquickanchors_p.h>
FRAMELESSHELPER_BEGIN_NAMESPACE
using namespace Global;
FRAMELESSHELPER_STRING_CONSTANT2(DarkUrl, "image://framelesshelper/dark/minimize")
FRAMELESSHELPER_STRING_CONSTANT2(LightUrl, "image://framelesshelper/light/minimize")
QuickStandardMinimizeButton::QuickStandardMinimizeButton(QQuickItem *parent) : QQuickButton(parent)
{
initialize();
}
QuickStandardMinimizeButton::~QuickStandardMinimizeButton() = default;
void QuickStandardMinimizeButton::updateForeground()
{
const bool dark = (FramelessQuickUtils::darkModeEnabled() || FramelessQuickUtils::titleBarColorized());
const auto url = QUrl(dark ? kDarkUrl : kLightUrl);
m_image->setSource(url);
}
void QuickStandardMinimizeButton::updateBackground()
{
static constexpr const auto button = SystemButtonType::Minimize;
const ButtonState state = (isPressed() ? ButtonState::Pressed : ButtonState::Hovered);
const bool visible = (isHovered() || isPressed());
m_backgroundItem->setColor(FramelessQuickUtils::getSystemButtonBackgroundColor(button, state));
m_backgroundItem->setVisible(visible);
}
void QuickStandardMinimizeButton::initialize()
{
m_contentItem.reset(new QQuickItem(this));
m_contentItem->setImplicitWidth(kDefaultSystemButtonSize.width());
m_contentItem->setImplicitHeight(kDefaultSystemButtonSize.height());
m_image.reset(new QQuickImage(m_contentItem.data()));
const auto imageAnchors = new QQuickAnchors(m_image.data(), m_image.data());
imageAnchors->setCenterIn(m_contentItem.data());
const FramelessQuickUtils * const utils = FramelessQuickUtils::instance();
connect(utils, &FramelessQuickUtils::darkModeEnabledChanged, this, &QuickStandardMinimizeButton::updateForeground);
connect(utils, &FramelessQuickUtils::titleBarColorizedChanged, this, &QuickStandardMinimizeButton::updateForeground);
m_backgroundItem.reset(new QQuickRectangle(this));
QQuickPen * const border = m_backgroundItem->border();
border->setWidth(0.0);
border->setColor(kDefaultTransparentColor);
connect(this, &QuickStandardMinimizeButton::hoveredChanged, this, &QuickStandardMinimizeButton::updateBackground);
connect(this, &QuickStandardMinimizeButton::pressedChanged, this, &QuickStandardMinimizeButton::updateBackground);
updateBackground();
updateForeground();
setContentItem(m_contentItem.data());
setBackground(m_backgroundItem.data());
}
FRAMELESSHELPER_END_NAMESPACE

59
src/quick/qml/StandardCloseButton.qml → src/quick/quickstandardminimizebutton_p.h
View File

@ -22,33 +22,38 @@
* SOFTWARE.
*/
import QtQuick 2.0
import QtQuick.Controls 2.0
import org.wangwenx190.FramelessHelper 1.0
#pragma once
Button {
id: button
objectName: "CloseButtonObject"
implicitWidth: FramelessUtils.defaultSystemButtonSize.width
implicitHeight: FramelessUtils.defaultSystemButtonSize.height
contentItem: Item {
implicitWidth: FramelessUtils.defaultSystemButtonIconSize.width
implicitHeight: FramelessUtils.defaultSystemButtonIconSize.height
#include <QtQuickTemplates2/private/qquickbutton_p.h>
#include "framelesshelperquick_global.h"
Image {
anchors.centerIn: parent
source: (button.hovered || FramelessUtils.darkModeEnabled || FramelessUtils.titleBarColorized)
? "image://framelesshelper/dark/close" : "image://framelesshelper/light/close"
}
}
background: Rectangle {
visible: button.hovered || button.pressed
color: FramelessUtils.getSystemButtonBackgroundColor(FramelessHelper.Close, (button.pressed ? FramelessHelper.Pressed : FramelessHelper.Hovered))
}
QT_BEGIN_NAMESPACE
class QQuickImage;
class QQuickRectangle;
QT_END_NAMESPACE
ToolTip {
visible: button.hovered && !button.pressed
delay: Qt.styleHints.mousePressAndHoldInterval
text: qsTr("Close")
}
}
FRAMELESSHELPER_BEGIN_NAMESPACE
class FRAMELESSHELPER_QUICK_API QuickStandardMinimizeButton : public QQuickButton
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(QuickStandardMinimizeButton)
public:
explicit QuickStandardMinimizeButton(QQuickItem *parent = nullptr);
~QuickStandardMinimizeButton() override;
public Q_SLOTS:
void updateForeground();
void updateBackground();
private:
void initialize();
private:
QScopedPointer<QQuickItem> m_contentItem;
QScopedPointer<QQuickImage> m_image;
QScopedPointer<QQuickRectangle> m_backgroundItem;
};
FRAMELESSHELPER_END_NAMESPACE

17
include/FramelessHelper/Quick/framelessquickhelper.h → src/quick/quickstandardtitlebar.cpp
View File

@ -22,20 +22,19 @@
* SOFTWARE.
*/
#pragma once
#include "framelesshelperquick_global.h"
QT_BEGIN_NAMESPACE
class QQmlEngine;
QT_END_NAMESPACE
#include "quickstandardtitlebar_p.h"
FRAMELESSHELPER_BEGIN_NAMESPACE
namespace FramelessHelper::Quick
QuickStandardTitleBar::QuickStandardTitleBar(QQuickItem *parent) : QQuickRectangle(parent)
{
initialize();
}
FRAMELESSHELPER_QUICK_API void registerTypes(QQmlEngine *engine);
QuickStandardTitleBar::~QuickStandardTitleBar() = default;
void QuickStandardTitleBar::initialize()
{
}

59
src/quick/quickstandardtitlebar_p.h Normal file
View File

@ -0,0 +1,59 @@
/*
* MIT License
*
* Copyright (C) 2022 by wangwenx190 (Yuhang Zhao)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#pragma once
#include <QtQuick/private/qquickrectangle_p.h>
#include "framelesshelperquick_global.h"
QT_BEGIN_NAMESPACE
class QQuickLabel;
QT_END_NAMESPACE
FRAMELESSHELPER_BEGIN_NAMESPACE
class QuickStandardMinimizeButton;
class QuickStandardMaximizeButton;
class QuickStandardCloseButton;
class QuickStandardTitleBar : public QQuickRectangle
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(QuickStandardTitleBar)
public:
explicit QuickStandardTitleBar(QQuickItem *parent = nullptr);
~QuickStandardTitleBar() override;
private:
void initialize();
private:
QScopedPointer<QQuickLabel> m_label;
QScopedPointer<QuickStandardMinimizeButton> m_minBtn;
QScopedPointer<QuickStandardMaximizeButton> m_maxBtn;
QScopedPointer<QuickStandardCloseButton> m_closeBtn;
};
FRAMELESSHELPER_END_NAMESPACE

18
src/widgets/standardsystembutton.cpp
View File

@ -49,6 +49,24 @@ StandardSystemButtonPrivate::StandardSystemButtonPrivate(StandardSystemButton *q
StandardSystemButtonPrivate::~StandardSystemButtonPrivate() = default;
StandardSystemButtonPrivate *StandardSystemButtonPrivate::get(StandardSystemButton *pub)
{
Q_ASSERT(pub);
if (!pub) {
return nullptr;
}
return pub->d_func();
}
const StandardSystemButtonPrivate *StandardSystemButtonPrivate::get(const StandardSystemButton *pub)
{
Q_ASSERT(pub);
if (!pub) {
return nullptr;
}
return pub->d_func();
}
void StandardSystemButtonPrivate::refreshButtonTheme(const bool force)
{
if (m_buttonType == SystemButtonType::Unknown) {

3
src/widgets/standardsystembutton_p.h
View File

@ -47,6 +47,9 @@ public:
explicit StandardSystemButtonPrivate(StandardSystemButton *q);
~StandardSystemButtonPrivate() override;
Q_NODISCARD static StandardSystemButtonPrivate *get(StandardSystemButton *pub);
Q_NODISCARD static const StandardSystemButtonPrivate *get(const StandardSystemButton *pub);
void refreshButtonTheme(const bool force);
Q_NODISCARD Global::SystemButtonType getButtonType() const;