From f0deb25d31dbfde951d604d8a9368832bc4ebaa8 Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 29 Dec 2023 03:24:22 +0000 Subject: [PATCH] Improve performance mode gains by removing more styling --- .../xpipe/app/resources/style/color-box.css | 94 ++++++++++++++++--- .../app/resources/style/store-entry-comp.css | 1 - .../io/xpipe/app/resources/style/style.css | 12 ++- 3 files changed, 92 insertions(+), 15 deletions(-) diff --git a/app/src/main/resources/io/xpipe/app/resources/style/color-box.css b/app/src/main/resources/io/xpipe/app/resources/style/color-box.css index 2002f8035..c248699fb 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/color-box.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/color-box.css @@ -1,95 +1,165 @@ -.root:dark .color-box { +.root:pretty:dark .color-box { -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, 5%) 40%, derive(-color-bg-default, 1%) 50%, derive(-color-bg-default, 5%) 100%); -fx-border-color: -color-border-default; } -.root:light .color-box { +.root:performance:dark .color-box { + -fx-background-color: derive(-color-bg-default, 5%); + -fx-border-color: -color-border-default; +} + +.root:pretty:light .color-box { -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -8%) 40%, derive(-color-bg-default, -3%) 50%, derive(-color-bg-default, -8%) 100%); -fx-border-color: derive(-color-border-default, -10%); } -.root:dark .color-box.gray { +.root:performance:light .color-box { + -fx-background-color: derive(-color-bg-default, -8%); + -fx-border-color: derive(-color-border-default, -10%); +} + + + +.root:pretty:dark .color-box.gray { -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, 13%) 40%, derive(-color-bg-default, 11%) 50%, derive(-color-bg-default, 14%) 100%); -fx-border-color: -color-border-default; } -.root:light .color-box.gray { +.root:performance:dark .color-box.gray { + -fx-background-color: derive(-color-bg-default, 13%); + -fx-border-color: -color-border-default; +} + +.root:pretty:light .color-box.gray { -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -5%) 40%, derive(-color-bg-default, -3%) 50%, derive(-color-bg-default, -5%) 100%); -fx-border-color: derive(-color-border-default, -10%); } +.root:performance:light .color-box.gray { + -fx-background-color: derive(-color-bg-default, -5%); + -fx-border-color: derive(-color-border-default, -10%); +} + .color-box > .separator .line { -fx-border-color: -color-border-default; } -.root:light .color-box.blue { + + +.root:pretty:light .color-box.blue { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(130, 130, 250, 0.2) 40%, rgb(57, 57, 200, 0.2) 50%, rgb(137, 137, 250, 0.2) 100%); -fx-border-color: rgba(80, 100, 150, 0.3); } +.root:performance:light .color-box.blue { + -fx-background-color: rgb(130, 130, 250, 0.2); + -fx-border-color: rgba(80, 100, 150, 0.3); +} + .root:light .color-box.blue > .separator .line { -fx-border-color: rgba(80, 100, 150, 0.4); } -.root:dark .color-box.blue { +.root:pretty:dark .color-box.blue { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(30, 30, 80, 0.8) 40%, rgb(27, 27, 65, 0.8) 50%, rgb(37, 37, 100, 0.8) 100%); -fx-border-color: rgba(80, 100, 150, 0.7); } +.root:performance:dark .color-box.blue { + -fx-background-color: rgb(30, 30, 80, 0.8); + -fx-border-color: rgba(80, 100, 150, 0.7); +} + .root:dark .color-box.blue > .separator .line { -fx-border-color: rgba(80, 100, 150, 0.7); } -.root:light .color-box.red { + + +.root:pretty:light .color-box.red { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(220, 100, 100, 0.15) 40%, rgb(205, 50, 50, 0.15) 50%, rgb(200, 90, 90, 0.15) 100%); -fx-border-color: rgba(150, 100, 80, 0.4); } +.root:performance:light .color-box.red { + -fx-background-color: rgb(220, 100, 100, 0.15); + -fx-border-color: rgba(150, 100, 80, 0.4); +} + .root:light .color-box.red > .separator .line { -fx-border-color: rgba(150, 100, 80, 0.4); } -.root:dark .color-box.red { +.root:pretty:dark .color-box.red { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(80, 30, 30, 0.4) 40%, rgb(65, 27, 27, 0.4) 50%, rgb(100, 37, 37, 0.4) 100%); -fx-border-color: rgba(150, 100, 80, 0.4); } +.root:performance:dark .color-box.red { + -fx-background-color: rgb(80, 30, 30, 0.4); + -fx-border-color: rgba(150, 100, 80, 0.4); +} + .root:dark .color-box.red > .separator .line { -fx-border-color: rgba(150, 100, 80, 0.4); } -.root:light .color-box.yellow { + + +.root:pretty:light .color-box.yellow { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(180, 180, 30, 0.2) 40%, rgb(135, 135, 27, 0.2) 50%, rgb(200, 200, 37, 0.2) 100%); -fx-border-color: rgba(170, 170, 80, 0.3); } +.root:performance:light .color-box.yellow { + -fx-background-color: rgb(180, 180, 30, 0.2); + -fx-border-color: rgba(170, 170, 80, 0.3); +} + .root:light .color-box.yellow > .separator .line { -fx-border-color: rgba(170, 170, 80, 0.5); } -.root:dark .color-box.yellow { +.root:pretty:dark .color-box.yellow { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(80, 80, 30, 0.4) 40%, rgb(65, 65, 27, 0.4) 50%, rgb(100, 100, 37, 0.4) 100%); -fx-border-color: rgba(150, 150, 80, 0.4); } +.root:performance:dark .color-box.yellow { + -fx-background-color: rgb(80, 80, 30, 0.4); + -fx-border-color: rgba(150, 150, 80, 0.4); +} + .root:dark .color-box.yellow > .separator .line { -fx-border-color: rgba(170, 170, 80, 0.3); } -.root:light .color-box.green { + + +.root:pretty:light .color-box.green { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(30, 180, 30, 0.1) 40%, rgb(20, 120, 20, 0.15) 50%, rgb(37, 200, 37, 0.1) 100%); -fx-border-color: rgba(100, 150, 80, 0.2); } +.root:performance:light .color-box.green { + -fx-background-color: rgb(30, 180, 30, 0.1); + -fx-border-color: rgba(100, 150, 80, 0.2); +} + .root:light .color-box.green > .separator .line { -fx-border-color: rgba(100, 150, 80, 0.4); } -.root:dark .color-box.green { +.root:pretty:dark .color-box.green { -fx-background-color: linear-gradient(from 100% 0% to 0% 100% , rgb(30, 80, 30, 0.3) 40%, rgb(20, 60, 20, 0.3) 50%, rgb(37, 100, 37, 0.3) 100%); -fx-border-color: rgba(100, 190, 80, 0.3); } +.root:performance:dark .color-box.green { + -fx-background-color: rgb(30, 80, 30, 0.3); + -fx-border-color: rgba(100, 190, 80, 0.3); +} + .root:dark .color-box.green > .separator .line { -fx-border-color: rgba(100, 190, 80, 0.2); } \ No newline at end of file diff --git a/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css b/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css index 5ae43f28a..430ff6500 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/store-entry-comp.css @@ -39,7 +39,6 @@ .root:pretty .store-entry-grid .icon { -fx-effect: dropshadow(three-pass-box, -color-shadow-default, 2px, 0.5, 0, 1); - } .root:pretty .store-entry-grid .icon > * { diff --git a/app/src/main/resources/io/xpipe/app/resources/style/style.css b/app/src/main/resources/io/xpipe/app/resources/style/style.css index 8e39cded6..37de01011 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/style.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/style.css @@ -17,14 +17,22 @@ -fx-background-color: transparent; } -.root:dark.background { +.root:pretty:dark.background { -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, 5%) 40%, derive(-color-bg-default, 2%) 50%, derive(-color-bg-default, 5%) 100%); } -.root:light.background { +.root:performance:dark.background { + -fx-background-color: derive(-color-bg-default, 5%); +} + +.root:pretty:light.background { -fx-background-color: linear-gradient(from 100% 0% to 0% 100%, derive(-color-bg-default, -9%) 40%, derive(-color-bg-default, 1%) 50%, derive(-color-bg-default, -9%) 100%); } +.root:performance:light.background { + -fx-background-color: derive(-color-bg-default, -9%); +} + .edit-button.icon-button-comp { -fx-background-radius: 4px; -fx-border-width: 1px;