amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-07-04 00:55:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi
2024-03-09 18:26:54 +08:00
parent 7c0c4cc451
commit 97b9a789b0
32 changed files with 470 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -83,7 +83,7 @@ endif()
#如果是Windows平台，则生成rc文件
set(FLUENTUI_VERSION_RC_PATH "")
if(WIN32)
set(FLUENTUI_VERSION_RC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/version_${PROJECT_NAME}.rc)
set(FLUENTUI_VERSION_RC_PATH ${CMAKE_CURRENT_BINARY_DIR}/version_${PROJECT_NAME}.rc)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/.cmake/version_dll.rc.in
${FLUENTUI_VERSION_RC_PATH}

2
src/FluFramelessHelper.cpp
View File

@ -64,7 +64,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0)
{
wp->flags |= SWP_NOCOPYBITS;
*result = DefWindowProcW(hwnd, uMsg, wParam, lParam);
*result = 0;
return true;
}
return false;

34
src/Qt5/imports/FluentUI/Controls/FluColorPicker.qml
View File

@ -13,6 +13,14 @@ Button{
property color current : Qt.rgba(1,1,1,1)
signal accepted()
property int colorHandleRadius: 8
property string cancelText: "取消"
property string okText: "确定"
property string titleText: "颜色选择器"
property string editText: "编辑颜色"
property string redText: "红色"
property string greenText: "绿色"
property string blueText: "蓝色"
property string opacityText: "透明度"
background:
Rectangle{
id:layout_color
@ -60,7 +68,7 @@ Button{
Layout.fillWidth: true
Layout.fillHeight: true
FluButton{
text: "取消"
text: control.cancelText
width: parent.width
anchors.centerIn: parent
onClicked: {
@ -72,7 +80,7 @@ Button{
Layout.fillWidth: true
Layout.fillHeight: true
FluFilledButton{
text: "确认"
text: control.okText
width: parent.width
anchors.centerIn: parent
onClicked: {
@ -93,13 +101,13 @@ Button{
clip: true
ScrollBar.vertical: FluScrollBar {}
Item{
id:layout_content
id: layout_content
width: parent.width
height: childrenRect.height
FluText{
id:text_titile
font:FluTextStyle.Subtitle
text:"颜色选择器"
id: text_titile
font: FluTextStyle.Subtitle
text: control.titleText
anchors{
left: parent.left
top: parent.top
@ -108,7 +116,7 @@ Button{
}
}
Item{
id:layout_sb
id: layout_sb
width: 200
height: 200
anchors{
@ -117,7 +125,7 @@ Button{
leftMargin: 12
}
FluClip{
id:layout_color_hue
id: layout_color_hue
property color colorValue
property real xPercent: pickerCursor.x/width
property real yPercent: pickerCursor.y/height
@ -455,7 +463,7 @@ Button{
width: parent.width
height: text_box_color.height
FluText{
text:"编辑颜色"
text: control.editText
anchors{
verticalCenter: parent.verticalCenter
left:parent.left
@ -507,7 +515,7 @@ Button{
}
}
FluText{
text:"Red"
text: control.redText
anchors.verticalCenter: parent.verticalCenter
}
}
@ -526,7 +534,7 @@ Button{
}
}
FluText{
text:"Green"
text: control.greenText
anchors.verticalCenter: parent.verticalCenter
}
}
@ -545,7 +553,7 @@ Button{
}
}
FluText{
text:"Blue"
text: control.blueText
anchors.verticalCenter: parent.verticalCenter
}
}
@ -570,7 +578,7 @@ Button{
}
}
FluText{
text:"Opacity"
text: control.opacityText
anchors.verticalCenter: parent.verticalCenter
}
}

34
src/Qt6/imports/FluentUI/Controls/FluColorPicker.qml
View File

@ -13,6 +13,14 @@ Button{
property color current : Qt.rgba(1,1,1,1)
signal accepted()
property int colorHandleRadius: 8
property string cancelText: "取消"
property string okText: "确定"
property string titleText: "颜色选择器"
property string editText: "编辑颜色"
property string redText: "红色"
property string greenText: "绿色"
property string blueText: "蓝色"
property string opacityText: "透明度"
background:
Rectangle{
id:layout_color
@ -60,7 +68,7 @@ Button{
Layout.fillWidth: true
Layout.fillHeight: true
FluButton{
text: "取消"
text: control.cancelText
width: parent.width
anchors.centerIn: parent
onClicked: {
@ -72,7 +80,7 @@ Button{
Layout.fillWidth: true
Layout.fillHeight: true
FluFilledButton{
text: "确认"
text: control.okText
width: parent.width
anchors.centerIn: parent
onClicked: {
@ -93,13 +101,13 @@ Button{
clip: true
ScrollBar.vertical: FluScrollBar {}
Item{
id:layout_content
id: layout_content
width: parent.width
height: childrenRect.height
FluText{
id:text_titile
font:FluTextStyle.Subtitle
text:"颜色选择器"
id: text_titile
font: FluTextStyle.Subtitle
text: control.titleText
anchors{
left: parent.left
top: parent.top
@ -108,7 +116,7 @@ Button{
}
}
Item{
id:layout_sb
id: layout_sb
width: 200
height: 200
anchors{
@ -117,7 +125,7 @@ Button{
leftMargin: 12
}
FluClip{
id:layout_color_hue
id: layout_color_hue
property color colorValue
property real xPercent: pickerCursor.x/width
property real yPercent: pickerCursor.y/height
@ -455,7 +463,7 @@ Button{
width: parent.width
height: text_box_color.height
FluText{
text:"编辑颜色"
text: control.editText
anchors{
verticalCenter: parent.verticalCenter
left:parent.left
@ -507,7 +515,7 @@ Button{
}
}
FluText{
text:"Red"
text: control.redText
anchors.verticalCenter: parent.verticalCenter
}
}
@ -526,7 +534,7 @@ Button{
}
}
FluText{
text:"Green"
text: control.greenText
anchors.verticalCenter: parent.verticalCenter
}
}
@ -545,7 +553,7 @@ Button{
}
}
FluText{
text:"Blue"
text: control.blueText
anchors.verticalCenter: parent.verticalCenter
}
}
@ -570,7 +578,7 @@ Button{
}
}
FluText{
text:"Opacity"
text: control.opacityText
anchors.verticalCenter: parent.verticalCenter
}
}

32
src/version_fluentuiplugin.rc
View File

@ -1,32 +0,0 @@
1 VERSIONINFO
FILEVERSION 1,6,9,1176
PRODUCTVERSION 1,6,9,1176
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080404b0"
BEGIN
VALUE "CompanyName", "ZhuZiChu"
VALUE "FileDescription", ""
VALUE "FileVersion", "1.6.9.1176"
VALUE "InternalName", "fluentuiplugin.dll"
VALUE "LegalCopyright", "Copyright (C) 2023 ZhuZiChu. All rights reserved."
VALUE "OriginalFilename", "fluentuiplugin.dll"
VALUE "ProductName", "fluentuiplugin"
VALUE "ProductVersion", "1.6.9.0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x804, 1200
END
END