pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win] set top indent for main window

Browse Source 
* Set top indent for main window with thin border in Win10 and above
This commit is contained in:
SimplestStudio
2024-11-20 12:42:22 +02:00
parent 592c344fca
commit ae1e365683
18 changed files with 144 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
win-linux/res/styles/styles.qss
View File

@ -40,6 +40,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {background-origin: content; padding: 5px 0px 7px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 9px 0px 10px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 2px 0px 7px;}
@ -64,6 +68,7 @@ QPushButton#toolButtonMain {
border-right: 1px solid %7;
}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-right: 0px; border-left: 1px solid %7;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 5px;}
QPushButton#toolButtonMain[class=active] {background: %7;}
/*QPushButton#toolButtonMain[class=active],
@ -78,6 +83,7 @@ QPushButton::menu-indicator {width: 0px; height: 0px;}
QPushButton#toolButtonDownload {border-left: 0px; border-right: 1px solid %6; max-width: 40px; width: 40px; max-height: 28px; height: 28px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-right: 0px; border-left: 1px solid %6;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 35px; height: 35px;}
/**************************/
/* dark theme definitions */

6
win-linux/res/styles/styles@1.25x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 6px 0px 9px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 11px 0px 12px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 3px 0px 8px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 1px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 1px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 1px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 6px;}
QPushButton#toolButtonDownload {border-right-width: 1px; max-width: 50px; width: 50px; max-height: 35px; height: 35px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 1px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 44px; height: 44px;}
/* Menu */

6
win-linux/res/styles/styles@1.5x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 8px 0px 11px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 14px 0px 15px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 3px 0px 10px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 2px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 2px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 8px;}
QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 60px; width: 60px; max-height: 42px; height: 42px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 52px; height: 52px;}
/* Menu */

6
win-linux/res/styles/styles@1.75x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 9px 0px 13px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 16px 0px 17px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 4px 0px 12px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 2px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 2px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 9px;}
QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 70px; width: 70px; max-height: 49px; height: 49px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 61px; height: 61px;}
/* Menu */

6
win-linux/res/styles/styles@2.25x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 11px 0px 16px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 21px 0px 22px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 5px 0px 15px;}
@ -16,9 +20,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 2px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 2px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 11px;}
QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 90px; width: 90px; max-height: 63px; height: 63px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 78px; height: 78px;}
/* Menu */

6
win-linux/res/styles/styles@2.5x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 13px 0px 18px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 24px 0px 24px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 5px 0px 17px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 3px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 3px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 3px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 13px;}
QPushButton#toolButtonDownload {border-right-width: 3px; max-width: 100px; width: 100px; max-height: 70px; height: 70px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 3px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 87px; height: 87px;}
/* Menu */

6
win-linux/res/styles/styles@2.75x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 14px 0px 19px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 26px 0px 26px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 6px 0px 19px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 3px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 3px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 3px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 14px;}
QPushButton#toolButtonDownload {border-right-width: 3px; max-width: 110px; width: 110px; max-height: 77px; height: 77px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 3px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 96px; height: 96px;}
/* Menu */

6
win-linux/res/styles/styles@2x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 10px 0px 14px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 19px 0px 19px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 4px 0px 14px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 2px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 2px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 10px;}
QPushButton#toolButtonDownload {border-right-width: 2px; max-width: 80px; width: 80px; max-height: 56px; height: 56px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 2px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 70px; height: 70px;}
/* Menu */

6
win-linux/res/styles/styles@3.5x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 18px 0px 25px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 33px 0px 34px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 7px 0px 24px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 4px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 4px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 4px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 18px;}
QPushButton#toolButtonDownload {border-right-width: 4px; max-width: 140px; width: 140px; max-height: 98px; height: 98px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 4px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 122px; height: 122px;}
/* Menu */

6
win-linux/res/styles/styles@3x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 15px 0px 21px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 28px 0px 29px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 6px 0px 21px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 3px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 3px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 3px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 15px;}
QPushButton#toolButtonDownload {border-right-width: 3px; max-width: 120px; width: 120px; max-height: 84px; height: 84px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 3px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 105px; height: 105px;}
/* Menu */

6
win-linux/res/styles/styles@4.5x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 23px 0px 32px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 43px 0px 43px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 9px 0px 31px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 5px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 5px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 5px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 23px;}
QPushButton#toolButtonDownload {border-right-width: 5px; max-width: 180px; width: 180px; max-height: 126px; height: 126px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 5px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 157px; height: 157px;}
/* Menu */

6
win-linux/res/styles/styles@4x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 20px 0px 28px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 38px 0px 38px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 8px 0px 28px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 4px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 4px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 4px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 20px;}
QPushButton#toolButtonDownload {border-right-width: 4px; max-width: 160px; width: 160px; max-height: 112px; height: 112px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 4px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 140px; height: 140px;}
/* Menu */

6
win-linux/res/styles/styles@5x.qss
View File

@ -6,6 +6,10 @@ QPushButton#toolButtonMaximize,
QPushButton#toolButtonMinimize,
QPushButton#toolButtonClose {padding: 25px 0px 35px;}
QPushButton#toolButtonMaximize[win10=true],
QPushButton#toolButtonMinimize[win10=true],
QPushButton#toolButtonClose[win10=true] {padding: 47px 0px 48px;}
QPushButton#toolButtonMaximize[kde=true],
QPushButton#toolButtonMinimize[kde=true],
QPushButton#toolButtonClose[kde=true] {padding: 10px 0px 35px;}
@ -15,9 +19,11 @@ QPushButton#toolButtonMain[theme=light] {border-width: 5px; border-bottom: 0 non
QPushButton#toolButtonMain[class=normal],
QPushButton#toolButtonMain[class=normal]:hover {border-bottom-width: 5px;}
#mainPanel[rtl=true] QPushButton#toolButtonMain {border-left-width: 5px;}
#mainPanel[win10=true] QPushButton#toolButtonMain {margin-top: 25px;}
QPushButton#toolButtonDownload {border-right-width: 5px; max-width: 200px; width: 200px; max-height: 140px; height: 140px;}
#mainPanel[rtl=true] QPushButton#toolButtonDownload {border-left-width: 5px;}
#mainPanel[win10=true] QPushButton#toolButtonDownload {max-height: 175px; height: 175px;}
/* Menu */

13
win-linux/res/styles/tabbar.qss
View File

@ -83,6 +83,7 @@ Tab #tabIcon {padding: 0px; min-width: 15px; min-height: 15px; max-width: 15px;
Tab #tabText {font-size: 11px;}
Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2px;}
#mainPanel[rtl-font=true][unix=true] Tab #tabText {font-size: 12px;}
#mainPanel[win10=true] CTabBar {margin-top: 5px;}
/* 1.25x */
#mainPanel[zoom="1.25x"] CTabBar #tabScroll {min-width: 48px; max-width: 48px;}
@ -93,6 +94,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="1.25x"] Tab #tabButton {width: 20px; max-width: 20px; max-height: 20px; border-width: 2px;}
#mainPanel[zoom="1.25x"][rtl=true] Tab {border-left-width: 1px;}
#mainPanel[zoom="1.25x"][rtl-font=true][unix=true] Tab #tabText {font-size: 15px;}
#mainPanel[zoom="1.25x"][win10=true] CTabBar {margin-top: 6px;}
/* 1.5x */
#mainPanel[zoom="1.5x"] CTabBar #tabScroll {min-width: 48px; max-width: 48px;}
@ -103,6 +105,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="1.5x"] Tab #tabButton {width: 24px; max-width: 24px; max-height: 24px; border-width: 2px;}
#mainPanel[zoom="1.5x"][rtl=true] Tab {border-left-width: 2px;}
#mainPanel[zoom="1.5x"][rtl-font=true][unix=true] Tab #tabText {font-size: 17px;}
#mainPanel[zoom="1.5x"][win10=true] CTabBar {margin-top: 8px;}
/* 1.75x */
#mainPanel[zoom="1.75x"] CTabBar #tabScroll {min-width: 64px; max-width: 64px;}
@ -113,6 +116,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="1.75x"] Tab #tabButton {width: 28px; max-width: 28px; max-height: 28px; border-width: 2px;}
#mainPanel[zoom="1.75x"][rtl=true] Tab {border-left-width: 2px;}
#mainPanel[zoom="1.75x"][rtl-font=true][unix=true] Tab #tabText {font-size: 19px;}
#mainPanel[zoom="1.75x"][win10=true] CTabBar {margin-top: 9px;}
/* 2x */
#mainPanel[zoom="2x"] CTabBar #tabScroll {min-width: 64px; max-width: 64px;}
@ -123,6 +127,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="2x"] Tab #tabButton {width: 32px; max-width: 32px; max-height: 32px; border-width: 2px;}
#mainPanel[zoom="2x"][rtl=true] Tab {border-left-width: 2px;}
#mainPanel[zoom="2x"][rtl-font=true][unix=true] Tab #tabText {font-size: 22px;}
#mainPanel[zoom="2x"][win10=true] CTabBar {margin-top: 10px;}
/* 2.25x */
#mainPanel[zoom="2.25x"] CTabBar #tabScroll {min-width: 72px; max-width: 72px;}
@ -133,6 +138,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="2.25x"] Tab #tabButton {width: 36px; max-width: 36px; max-height: 36px; border-width: 2px;}
#mainPanel[zoom="2.25x"][rtl=true] Tab {border-left-width: 2px;}
#mainPanel[zoom="2.25x"][rtl-font=true][unix=true] Tab #tabText {font-size: 25px;}
#mainPanel[zoom="2.25x"][win10=true] CTabBar {margin-top: 11px;}
/* 2.5x */
#mainPanel[zoom="2.5x"] CTabBar #tabScroll {min-width: 80px; max-width: 80px;}
@ -143,6 +149,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="2.5x"] Tab #tabButton {width: 40px; max-width: 40px; max-height: 40px; border-width: 2px;}
#mainPanel[zoom="2.5x"][rtl=true] Tab {border-left-width: 3px;}
#mainPanel[zoom="2.5x"][rtl-font=true][unix=true] Tab #tabText {font-size: 27px;}
#mainPanel[zoom="2.5x"][win10=true] CTabBar {margin-top: 13px;}
/* 2.75x */
#mainPanel[zoom="2.75x"] CTabBar #tabScroll {min-width: 88px; max-width: 88px;}
@ -153,6 +160,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="2.75x"] Tab #tabButton {width: 44px; max-width: 44px; max-height: 44px; border-width: 2px;}
#mainPanel[zoom="2.75x"][rtl=true] Tab {border-left-width: 3px;}
#mainPanel[zoom="2.75x"][rtl-font=true][unix=true] Tab #tabText {font-size: 30px;}
#mainPanel[zoom="2.75x"][win10=true] CTabBar {margin-top: 14px;}
/* 3x */
#mainPanel[zoom="3x"] CTabBar #tabScroll {min-width: 96px; max-width: 96px;}
@ -163,6 +171,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="3x"] Tab #tabButton {width: 48px; max-width: 48px; max-height: 48px; border-width: 2px;}
#mainPanel[zoom="3x"][rtl=true] Tab {border-left-width: 3px;}
#mainPanel[zoom="3x"][rtl-font=true][unix=true] Tab #tabText {font-size: 34px;}
#mainPanel[zoom="3x"][win10=true] CTabBar {margin-top: 15px;}
/* 3.5x */
#mainPanel[zoom="3.5x"] CTabBar #tabScroll {min-width: 112px; max-width: 112px;}
@ -173,6 +182,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="3.5x"] Tab #tabButton {width: 56px; max-width: 56px; max-height: 56px; border-width: 2px;}
#mainPanel[zoom="3.5x"][rtl=true] Tab {border-left-width: 4px;}
#mainPanel[zoom="3.5x"][rtl-font=true][unix=true] Tab #tabText {font-size: 39px;}
#mainPanel[zoom="3.5x"][win10=true] CTabBar {margin-top: 18px;}
/* 4x */
#mainPanel[zoom="4x"] CTabBar #tabScroll {min-width: 128px; max-width: 128px;}
@ -183,6 +193,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="4x"] Tab #tabButton {width: 64px; max-width: 64px; max-height: 64px; border-width: 2px;}
#mainPanel[zoom="4x"][rtl=true] Tab {border-left-width: 4px;}
#mainPanel[zoom="4x"][rtl-font=true][unix=true] Tab #tabText {font-size: 44px;}
#mainPanel[zoom="4x"][win10=true] CTabBar {margin-top: 20px;}
/* 4.5x */
#mainPanel[zoom="4.5x"] CTabBar #tabScroll {min-width: 144px; max-width: 144px;}
@ -193,6 +204,7 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="4.5x"] Tab #tabButton {width: 72px; max-width: 72px; max-height: 72px; border-width: 2px;}
#mainPanel[zoom="4.5x"][rtl=true] Tab {border-left-width: 5px;}
#mainPanel[zoom="4.5x"][rtl-font=true][unix=true] Tab #tabText {font-size: 49px;}
#mainPanel[zoom="4.5x"][win10=true] CTabBar {margin-top: 23px;}
/* 5x */
#mainPanel[zoom="5x"] CTabBar #tabScroll {min-width: 160px; max-width: 160px;}
@ -203,3 +215,4 @@ Tab #tabButton {width: 16px; max-width: 16px; max-height: 16px; border-width: 2p
#mainPanel[zoom="5x"] Tab #tabButton {width: 80px; max-width: 80px; max-height: 80px; border-width: 2px;}
#mainPanel[zoom="5x"][rtl=true] Tab {border-left-width: 5px;}
#mainPanel[zoom="5x"][rtl-font=true][unix=true] Tab #tabText {font-size: 55px;}
#mainPanel[zoom="5x"][win10=true] CTabBar {margin-top: 25px;}

46
win-linux/src/windows/cmainwindow.cpp
View File

@ -75,6 +75,10 @@ CMainWindow::CMainWindow(const QRect &rect) :
m_savePortal(QString())
{
setObjectName("MainWindow");
#ifdef _WIN32
if (Utils::getWinVersion() >= Utils::WinVer::Win10 && isCustomWindowStyle())
m_toolbtn_height = TOOLBTN_HEIGHT_WIN10;
#endif
m_pMainPanel = createMainPanel(this);
setCentralWidget(m_pMainPanel);
QString css{AscAppManager::getWindowStylesheets(m_dpiRatio)};
@ -417,6 +421,8 @@ QWidget* CMainWindow::createMainPanel(QWidget *parent)
mainPanel->setProperty("rtl-font", CLangater::isRtlLanguage(CLangater::getCurrentLangCode()));
#ifdef _WIN32
mainPanel->setProperty("unix", false);
if (Utils::getWinVersion() >= Utils::WinVer::Win10 && isCustomWindowStyle())
mainPanel->setProperty("win10", true);
#else
mainPanel->setProperty("unix", true);
#endif
@ -438,6 +444,14 @@ QWidget* CMainWindow::createMainPanel(QWidget *parent)
_pMainGridLayout->addWidget(m_boxTitleBtns, 0, 2, 1, 1);
m_boxTitleBtns->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
#ifdef _WIN32
if (Utils::getWinVersion() >= Utils::WinVer::Win10 && isCustomWindowStyle()) {
foreach (auto *btn, m_pTopButtons) {
btn->setProperty("win10", true);
}
}
#endif
#ifdef __DONT_WRITE_IN_APP_TITLE
QLabel * label = new QLabel(m_boxTitleBtns);
#else
@ -1622,7 +1636,7 @@ void CMainWindow::updateScalingFactor(double dpiratio)
foreach (auto btn, m_pTopButtons)
btn->setFixedSize(small_btn_size);
}*/
m_pButtonMain->setFixedSize(int(BUTTON_MAIN_WIDTH * dpiratio), int(TITLE_HEIGHT * dpiratio));
m_pButtonMain->setFixedSize(int(BUTTON_MAIN_WIDTH * dpiratio), int(m_toolbtn_height * dpiratio));
m_pMainPanel->setProperty("zoom", QString::number(dpiratio) + "x");
QString tab_css = Utils::readStylesheets(":/styles/tabbar.qss");
m_pTabs->tabBar()->setStyleSheet(tab_css.arg(GetColorQValueByRole(ecrWindowBackground),
@ -1732,6 +1746,36 @@ void CMainWindow::onLayoutDirectionChanged()
}
}
#ifdef _WIN32
void CMainWindow::applyWindowState()
{
if (Utils::getWinVersion() >= Utils::WinVer::Win10 && isCustomWindowStyle()) {
m_toolbtn_height = isMaximized() ? TOOLBTN_HEIGHT : TOOLBTN_HEIGHT_WIN10;
m_pMainPanel->setProperty("win10", !isMaximized());
m_pMainPanel->style()->polish(m_pMainPanel);
m_pButtonMain->style()->polish(m_pButtonMain);
m_pButtonMain->setFixedHeight(int(m_toolbtn_height * m_dpiRatio));
if (m_pWidgetDownload && m_pWidgetDownload->toolButton())
m_pWidgetDownload->toolButton()->style()->polish(m_pWidgetDownload->toolButton());
QString tab_css = Utils::readStylesheets(":/styles/tabbar.qss");
m_pTabs->tabBar()->setStyleSheet(tab_css.arg(GetColorQValueByRole(ecrWindowBackground),
GetColorQValueByRole(ecrButtonBackground),
GetColorQValueByRole(ecrButtonHoverBackground),
GetColorQValueByRole(ecrButtonPressedBackground),
GetColorQValueByRole(ecrTabDivider),
GetColorQValueByRole(ecrTabWordActive)));
foreach (auto *btn, m_pTopButtons) {
btn->setFixedHeight(int(m_toolbtn_height * m_dpiRatio));
btn->setProperty("win10", !isMaximized());
btn->style()->polish(btn);
}
}
CWindowBase::applyWindowState();
}
#endif
void CMainWindow::handleWindowAction(const std::wstring& action)
{
if ( !m_isStartPageReady ) {

3
win-linux/src/windows/cmainwindow.h
View File

@ -109,6 +109,9 @@ protected:
virtual QString getSaveMessage() const;
virtual void refreshAboutVersion() {};
virtual void onLayoutDirectionChanged() final;
#ifdef _WIN32
virtual void applyWindowState() final;
#endif
void closeEvent(QCloseEvent *) override;
void showEvent(QShowEvent *) override;

5
win-linux/src/windows/cwindowbase.cpp
View File

@ -142,7 +142,7 @@ QPushButton* CWindowBase::createToolButton(QWidget * parent, const QString& name
btn->setObjectName(name);
btn->setProperty("class", "normal");
btn->setProperty("act", "tool");
btn->setFixedSize(int(TITLEBTN_WIDTH*m_dpiRatio), int(TOOLBTN_HEIGHT*m_dpiRatio));
btn->setFixedSize(int(TITLEBTN_WIDTH*m_dpiRatio), int(m_toolbtn_height * m_dpiRatio));
#ifdef __linux__
btn->setMouseTracking(true);
btn->setProperty("unix", true);
@ -168,6 +168,7 @@ QWidget* CWindowBase::createTopPanel(QWidget *parent)
layoutBtns->setContentsMargins(0, 0, 0, 0);
layoutBtns->setSpacing(int(1*m_dpiRatio));
layoutBtns->addStretch();
layoutBtns->setAlignment(Qt::AlignTop);
_boxTitleBtns->setLayout(layoutBtns);
if (isCustomWindowStyle()) {
const QString names[3] = {"toolButtonMinimize", "toolButtonMaximize", "toolButtonClose"};
@ -246,7 +247,7 @@ void CWindowBase::setScreenScalingFactor(double factor, bool resize)
pLayoutBtns->setSpacing(int(1 * m_dpiRatio));
if (isCustomWindowStyle()) {
pLayoutBtns->setContentsMargins(0, 0, 0, 0);
QSize small_btn_size(int(TITLEBTN_WIDTH*m_dpiRatio), int(TOOLBTN_HEIGHT*m_dpiRatio));
QSize small_btn_size(int(TITLEBTN_WIDTH*m_dpiRatio), int(m_toolbtn_height * m_dpiRatio));
foreach (auto pBtn, m_pTopButtons)
pBtn->setFixedSize(small_btn_size);
}

2
win-linux/src/windows/cwindowbase.h
View File

@ -44,6 +44,7 @@
#define BUTTON_MAIN_WIDTH 112
#define MAIN_WINDOW_BORDER_WIDTH 3
#define WINDOW_TITLE_MIN_WIDTH 200
#define TOOLBTN_HEIGHT_WIN10 35
#define TOOLBTN_HEIGHT 28
#define TOOLBTN_WIDTH 40
#ifdef _WIN32
@ -102,6 +103,7 @@ protected:
QColor m_brdColor,
m_bkgColor;
QRect m_window_rect;
int m_toolbtn_height = TOOLBTN_HEIGHT;
virtual void showEvent(QShowEvent *);