mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2024-11-25 12:11:30 +08:00
Compare commits
2 Commits
fe08b08c1f
...
84b2045b5f
Author | SHA1 | Date | |
---|---|---|---|
|
84b2045b5f | ||
|
18193a18be |
@ -32,8 +32,11 @@ Q_IMPORT_QML_PLUGIN(FluentUIPlugin)
|
|||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
const char *uri = "example";
|
||||||
|
int major = 1;
|
||||||
|
int minor = 0;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
// ::SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
|
::SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
|
||||||
qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
|
qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
|
||||||
#endif
|
#endif
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
@ -54,8 +57,8 @@ int main(int argc, char *argv[])
|
|||||||
QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
|
QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
|
||||||
QGuiApplication::setQuitOnLastWindowClosed(false);
|
QGuiApplication::setQuitOnLastWindowClosed(false);
|
||||||
SettingsHelper::getInstance()->init(argv);
|
SettingsHelper::getInstance()->init(argv);
|
||||||
Log::setup(argv,"example");
|
Log::setup(argv,uri);
|
||||||
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
||||||
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
|
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
|
||||||
#endif
|
#endif
|
||||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
||||||
@ -66,9 +69,6 @@ int main(int argc, char *argv[])
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
QGuiApplication app(argc, argv);
|
QGuiApplication app(argc, argv);
|
||||||
const char *uri = "example";
|
|
||||||
int major = 1;
|
|
||||||
int minor = 0;
|
|
||||||
//@uri example
|
//@uri example
|
||||||
qmlRegisterType<CircularReveal>(uri, major, minor, "CircularReveal");
|
qmlRegisterType<CircularReveal>(uri, major, minor, "CircularReveal");
|
||||||
qmlRegisterType<FileWatcher>(uri, major, minor, "FileWatcher");
|
qmlRegisterType<FileWatcher>(uri, major, minor, "FileWatcher");
|
||||||
|
@ -76,7 +76,7 @@ void FluFrameless::componentComplete(){
|
|||||||
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
HWND hwnd = reinterpret_cast<HWND>(window()->winId());
|
||||||
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
|
||||||
if(_fixSize){
|
if(_fixSize){
|
||||||
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);
|
::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME);
|
||||||
for (int i = 0; i < qApp->screens().count(); ++i) {
|
for (int i = 0; i < qApp->screens().count(); ++i) {
|
||||||
connect( qApp->screens().at(i),&QScreen::logicalDotsPerInchChanged,this,[=]{
|
connect( qApp->screens().at(i),&QScreen::logicalDotsPerInchChanged,this,[=]{
|
||||||
SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
|
SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
|
||||||
|
@ -62,10 +62,6 @@ T.ComboBox {
|
|||||||
validator: control.validator
|
validator: control.validator
|
||||||
selectByMouse: true
|
selectByMouse: true
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
leftInset:1
|
|
||||||
topInset:1
|
|
||||||
bottomInset:1
|
|
||||||
rightInset:1
|
|
||||||
background: FluTextBoxBackground{
|
background: FluTextBoxBackground{
|
||||||
border.width: 0
|
border.width: 0
|
||||||
bottomMargin: {
|
bottomMargin: {
|
||||||
|
@ -20,7 +20,8 @@ FluControlBackground{
|
|||||||
border.width: 1
|
border.width: 1
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop { position: 0.0; color: d.startColor }
|
GradientStop { position: 0.0; color: d.startColor }
|
||||||
GradientStop { position: 0.92; color: d.startColor }
|
GradientStop { position: 1 - 3/control.height; color: d.startColor }
|
||||||
|
GradientStop { position: 1 - 2/control.height; color: d.startColor }
|
||||||
GradientStop { position: 1.0; color: d.endColor }
|
GradientStop { position: 1.0; color: d.endColor }
|
||||||
}
|
}
|
||||||
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
|
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
|
||||||
|
@ -62,10 +62,6 @@ T.ComboBox {
|
|||||||
validator: control.validator
|
validator: control.validator
|
||||||
selectByMouse: true
|
selectByMouse: true
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
leftInset:1
|
|
||||||
topInset:1
|
|
||||||
bottomInset:1
|
|
||||||
rightInset:1
|
|
||||||
background: FluTextBoxBackground{
|
background: FluTextBoxBackground{
|
||||||
border.width: 0
|
border.width: 0
|
||||||
bottomMargin: {
|
bottomMargin: {
|
||||||
|
@ -20,13 +20,13 @@ FluControlBackground{
|
|||||||
border.width: 1
|
border.width: 1
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop { position: 0.0; color: d.startColor }
|
GradientStop { position: 0.0; color: d.startColor }
|
||||||
GradientStop { position: d.position; color: d.startColor }
|
GradientStop { position: 1 - 3/control.height; color: d.startColor }
|
||||||
|
GradientStop { position: 1 - 2/control.height; color: d.startColor }
|
||||||
GradientStop { position: 1.0; color: d.endColor }
|
GradientStop { position: 1.0; color: d.endColor }
|
||||||
}
|
}
|
||||||
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
|
bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
|
||||||
QtObject{
|
QtObject{
|
||||||
id:d
|
id:d
|
||||||
property real position: 1 - 3/control.height
|
|
||||||
property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1)
|
property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1)
|
||||||
property color endColor: {
|
property color endColor: {
|
||||||
if(!control.enabled){
|
if(!control.enabled){
|
||||||
|
Loading…
Reference in New Issue
Block a user