diff --git a/LunaTranslator/files/defaultconfig/static_data.json b/LunaTranslator/files/defaultconfig/static_data.json index 63763601..005b989c 100644 --- a/LunaTranslator/files/defaultconfig/static_data.json +++ b/LunaTranslator/files/defaultconfig/static_data.json @@ -12,6 +12,10 @@ { "file": "dark3.py", "name": "BreezeStyleSheets" + }, + { + "file": "dark_win11like.py", + "name": "win11like" } ], "light": [ @@ -26,6 +30,10 @@ { "file": "light3.py", "name": "BreezeStyleSheets" + }, + { + "file": "light_win11like.py", + "name": "win11like" } ] }, diff --git a/LunaTranslator/files/themes/.keepdir b/LunaTranslator/files/themes/.keepdir new file mode 100644 index 00000000..e69de29b diff --git a/LunaTranslator/files/themes/dark1.py b/LunaTranslator/files/themes/dark1.py deleted file mode 100644 index 182d4035..00000000 --- a/LunaTranslator/files/themes/dark1.py +++ /dev/null @@ -1,3 +0,0 @@ -import qdarktheme -def stylesheet(): - return qdarktheme.load_stylesheet(theme='dark') \ No newline at end of file diff --git a/LunaTranslator/files/themes/dark2.py b/LunaTranslator/files/themes/dark2.py deleted file mode 100644 index 16946865..00000000 --- a/LunaTranslator/files/themes/dark2.py +++ /dev/null @@ -1,4 +0,0 @@ -import qdarkstyle - -def stylesheet(): - return qdarkstyle.load_stylesheet(palette=qdarkstyle.DarkPalette) \ No newline at end of file diff --git a/LunaTranslator/files/themes/dark3.py b/LunaTranslator/files/themes/dark3.py deleted file mode 100644 index c68dbdf5..00000000 --- a/LunaTranslator/files/themes/dark3.py +++ /dev/null @@ -1,9 +0,0 @@ -from PyQt5.QtCore import QFile, QTextStream -from . import breeze_resources - - -def stylesheet(): - file = QFile(":/dark/stylesheet.qss") - file.open(QFile.ReadOnly | QFile.Text) - stream = QTextStream(file) - return stream.readAll() diff --git a/LunaTranslator/files/themes/light1.py b/LunaTranslator/files/themes/light1.py deleted file mode 100644 index 8ebc695f..00000000 --- a/LunaTranslator/files/themes/light1.py +++ /dev/null @@ -1,3 +0,0 @@ -import qdarktheme -def stylesheet(): - return qdarktheme.load_stylesheet(theme='light') \ No newline at end of file diff --git a/LunaTranslator/files/themes/light2.py b/LunaTranslator/files/themes/light2.py deleted file mode 100644 index 1cbfc026..00000000 --- a/LunaTranslator/files/themes/light2.py +++ /dev/null @@ -1,4 +0,0 @@ -import qdarkstyle - -def stylesheet(): - return qdarkstyle.load_stylesheet(palette=qdarkstyle.LightPalette) \ No newline at end of file diff --git a/LunaTranslator/files/themes/light3.py b/LunaTranslator/files/themes/light3.py deleted file mode 100644 index f3a8bd2b..00000000 --- a/LunaTranslator/files/themes/light3.py +++ /dev/null @@ -1,9 +0,0 @@ -from PyQt5.QtCore import QFile, QTextStream -from . import breeze_resources - - -def stylesheet(): - file = QFile(":/light/stylesheet.qss") - file.open(QFile.ReadOnly | QFile.Text) - stream = QTextStream(file) - return stream.readAll() diff --git a/build.py b/build.py index 8ae525c4..8781a310 100644 --- a/build.py +++ b/build.py @@ -240,8 +240,10 @@ def buildPlugins(): def downloadsomething(): os.chdir(rootDir + "\\temp") - os.system('git clone https://github.com/Alexhuszagh/BreezeStyleSheets') - shutil.copy('BreezeStyleSheets/breeze_resources.py',rootDir + "\\LunaTranslator\\files\\themes") + os.system('git clone https://github.com/HIllya51/stylesheets') + for f in os.listdir('stylesheets'): + if os.path.isfile(os.path.join('stylesheets',f)): + shutil.copy(os.path.join('stylesheets',f),rootDir + "\\LunaTranslator\\files\\themes") if __name__ == "__main__": if sys.argv[1] == "loadversion": diff --git a/plugins/winsharedutils/theme.cpp b/plugins/winsharedutils/theme.cpp index 6a24bb8a..63e02f9a 100644 --- a/plugins/winsharedutils/theme.cpp +++ b/plugins/winsharedutils/theme.cpp @@ -164,6 +164,10 @@ bool _SetTheme( static const DWM_SYSTEMBACKDROP_TYPE BACKDROP_MAP[] = { DWMSBT_AUTO, DWMSBT_TRANSIENTWINDOW, DWMSBT_MAINWINDOW, DWMSBT_TABBEDWINDOW}; DWM_SYSTEMBACKDROP_TYPE value = BACKDROP_MAP[(int)backdrop]; + + MARGINS mar{-1,-1,-1,-1}; + DwmExtendFrameIntoClientArea(_hWnd,&mar); + DwmSetWindowAttribute(_hWnd, DWMWA_SYSTEMBACKDROP_TYPE, &value, sizeof(value)); return false;