amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-02-09 08:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuzichu 2023-07-11 10:46:57 +08:00
parent 6275c161fe
commit 78815224fe
10 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/CMakeLists.txt
View File

@ -24,7 +24,7 @@ endif()
file(TO_CMAKE_PATH "/" PATH_SEPARATOR) file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
#设置版本号 #设置版本号
add_definitions(-DVERSION=1,3,7,3) add_definitions(-DVERSION=1,3,7,4)
find_package(Qt6 REQUIRED COMPONENTS Quick) find_package(Qt6 REQUIRED COMPONENTS Quick)

1
example/qml/page/T_Awesome.qml
View File

@ -33,6 +33,7 @@ FluContentPage {
cellWidth: 80 cellWidth: 80
cellHeight: 80 cellHeight: 80
clip: true clip: true
boundsBehavior: GridView.StopAtBounds
model:FluApp.awesomelist() model:FluApp.awesomelist()
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
anchors{ anchors{

1
example/qml/page/T_Expander.qml
View File

@ -58,7 +58,6 @@ FluScrollablePage{
width: parent.width width: parent.width
height: parent.height height: parent.height
contentWidth: width contentWidth: width
maximumFlickVelocity: 1680
contentHeight: text_info.height contentHeight: text_info.height
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
FluText{ FluText{

4
example/qml/window/MainWindow.qml
View File

@ -25,6 +25,10 @@ CustomWindow {
event.accepted = false event.accepted = false
} }
Component.onCompleted: {
FluTools.setQuitOnLastWindowClosed(false)
}
Connections{ Connections{
target: appInfo target: appInfo
function onActiveWindow(){ function onActiveWindow(){

1
example/src/main.cpp
View File

@ -35,7 +35,6 @@ int main(int argc, char *argv[])
if(!appInfo->isOwnerProcess(&ipc)){ if(!appInfo->isOwnerProcess(&ipc)){
return 0; return 0;
} }
app.setQuitOnLastWindowClosed(false);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
FramelessHelper::Quick::registerTypes(&engine); FramelessHelper::Quick::registerTypes(&engine);
#ifdef FLUENTUI_BUILD_STATIC_LIB #ifdef FLUENTUI_BUILD_STATIC_LIB

3
src/CMakeLists.txt
View File

@ -15,7 +15,7 @@ endif()
set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI) set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
#设置版本号 #设置版本号
add_definitions(-DVERSION=1,3,7,3) add_definitions(-DVERSION=1,3,7,4)
find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml) find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
@ -67,7 +67,6 @@ if (FLUENTUI_BUILD_STATIC_LIB)
OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY} OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY}
VERSION 1.0 VERSION 1.0
URI "FluentUI" URI "FluentUI"
#修改qmltypes文件名称。默认fluentuiplugin.qmltypes，使用默认名称有时候import FluentUI会爆红，所以修改成plugins.qmltypes
TYPEINFO "plugins.qmltypes" TYPEINFO "plugins.qmltypes"
SOURCES ${sources_files} fluentui.rc SOURCES ${sources_files} fluentui.rc
QML_FILES ${qml_files} QML_FILES ${qml_files}

1
src/imports/FluentUI/Controls/FluNavigationView.qml
View File

@ -785,7 +785,6 @@ Item {
} }
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
clip: true clip: true
maximumFlickVelocity: 1680
contentHeight: nav_list.contentHeight contentHeight: nav_list.contentHeight
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
ListView{ ListView{

1
src/imports/FluentUI/Controls/FluScrollablePage.qml
View File

@ -38,7 +38,6 @@ FluPage {
bottom: parent.bottom bottom: parent.bottom
bottomMargin: control.bottomPadding bottomMargin: control.bottomPadding
} }
maximumFlickVelocity: 1680
contentWidth: parent.width contentWidth: parent.width
contentHeight: container.height contentHeight: container.height
ScrollBar.vertical: FluScrollBar { ScrollBar.vertical: FluScrollBar {

1
src/imports/FluentUI/Controls/FluTableView.qml
View File

@ -170,7 +170,6 @@ Rectangle {
} }
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
ScrollBar.horizontal: FluScrollBar{} ScrollBar.horizontal: FluScrollBar{}
maximumFlickVelocity: 1680
ScrollBar.vertical: FluScrollBar{} ScrollBar.vertical: FluScrollBar{}
selectionModel: ItemSelectionModel { selectionModel: ItemSelectionModel {
id:selection_model id:selection_model

1
src/imports/FluentUI/Controls/FluTreeView.qml
View File

@ -251,7 +251,6 @@ Item {
flickableDirection: Flickable.HorizontalAndVerticalFlick flickableDirection: Flickable.HorizontalAndVerticalFlick
clip: true clip: true
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
maximumFlickVelocity: 1680
ScrollBar.vertical: FluScrollBar {} ScrollBar.vertical: FluScrollBar {}
ScrollBar.horizontal: FluScrollBar { } ScrollBar.horizontal: FluScrollBar { }
} }