From bad156654bcd442551207d34e28f1551111d6098 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Sun, 24 Nov 2019 20:43:37 +0300 Subject: [PATCH 1/3] remove backdrop call --- src/components/themes/blueradiance/theme.css | 2 +- src/components/themes/dark/theme.css | 2 +- src/components/themes/emby/theme.css | 2 +- src/components/themes/light/theme.css | 2 +- src/components/themes/purple-haze/theme.css | 2 +- src/components/themes/wmc/theme.css | 2 +- src/controllers/itemdetailpage.js | 6 +----- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/components/themes/blueradiance/theme.css b/src/components/themes/blueradiance/theme.css index 3af56f79b7..1880abbf14 100644 --- a/src/components/themes/blueradiance/theme.css +++ b/src/components/themes/blueradiance/theme.css @@ -49,7 +49,7 @@ html { } .backgroundContainer.withBackdrop { - opacity: .93 + opacity: .60 } @media (orientation:portrait) { diff --git a/src/components/themes/dark/theme.css b/src/components/themes/dark/theme.css index b4d4bcda4b..541dc3f3ed 100644 --- a/src/components/themes/dark/theme.css +++ b/src/components/themes/dark/theme.css @@ -36,7 +36,7 @@ html { } .backgroundContainer.withBackdrop { - background-color: rgba(0, 0, 0, .86) + background-color: rgba(0, 0, 0, 0.60) } .paper-icon-button-light:hover:not(:disabled) { diff --git a/src/components/themes/emby/theme.css b/src/components/themes/emby/theme.css index 7206150235..15a2bbf6a9 100644 --- a/src/components/themes/emby/theme.css +++ b/src/components/themes/emby/theme.css @@ -36,7 +36,7 @@ html { } .backgroundContainer.withBackdrop { - background-color: rgba(0, 0, 0, .86) + background-color: rgba(0, 0, 0, .60) } .paper-icon-button-light:hover:not(:disabled) { diff --git a/src/components/themes/light/theme.css b/src/components/themes/light/theme.css index dfac15ec7c..6da511dfd2 100644 --- a/src/components/themes/light/theme.css +++ b/src/components/themes/light/theme.css @@ -48,7 +48,7 @@ html { } .backgroundContainer.withBackdrop { - background-color: rgba(255, 255, 255, .94) + background-color: rgba(255, 255, 255, .80) } .dialog { diff --git a/src/components/themes/purple-haze/theme.css b/src/components/themes/purple-haze/theme.css index 1bba1e6145..59591343ca 100644 --- a/src/components/themes/purple-haze/theme.css +++ b/src/components/themes/purple-haze/theme.css @@ -49,7 +49,7 @@ html { } .backgroundContainer.withBackdrop { - opacity: .93 + opacity: .60 } @media (orientation:portrait) { diff --git a/src/components/themes/wmc/theme.css b/src/components/themes/wmc/theme.css index a19eeb93a2..cfa602f47e 100644 --- a/src/components/themes/wmc/theme.css +++ b/src/components/themes/wmc/theme.css @@ -61,7 +61,7 @@ html { } .backgroundContainer.withBackdrop { - background: rgba(17, 98, 164, .9) + background: rgba(17, 98, 164, .60) } .paper-icon-button-light:hover:not(:disabled) { diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js index 3f8dc59b7f..b2a83b1938 100644 --- a/src/controllers/itemdetailpage.js +++ b/src/controllers/itemdetailpage.js @@ -521,11 +521,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild renderDetails(page, item, apiClient, context); renderTrackSelections(page, instance, item); - if (dom.getWindowSize().innerWidth >= 1000) { - backdrop.setBackdrops([item]); - } else { - backdrop.clear(); - } + backdrop.clear(); renderDetailPageBackdrop(page, item, apiClient); var canPlay = reloadPlayButtons(page, item); From 7afdc4b2b1dd9f3f5f98342a434ee9a225a76b59 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Thu, 28 Nov 2019 22:46:57 +0300 Subject: [PATCH 2/3] Fix enable backdrops --- src/controllers/itemdetailpage.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js index b2a83b1938..8d3e4b476e 100644 --- a/src/controllers/itemdetailpage.js +++ b/src/controllers/itemdetailpage.js @@ -1,4 +1,4 @@ -define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuilder", "datetime", "mediaInfo", "backdrop", "listView", "itemContextMenu", "itemHelper", "dom", "indicators", "apphost", "imageLoader", "libraryMenu", "globalize", "browser", "events", "scrollHelper", "playbackManager", "libraryBrowser", "scrollStyles", "emby-itemscontainer", "emby-checkbox", "emby-button", "emby-playstatebutton", "emby-ratingbutton", "emby-scroller", "emby-select"], function (loading, appRouter, layoutManager, connectionManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager, libraryBrowser) { +define(["loading", "appRouter", "layoutManager", "userSettings", "connectionManager", "cardBuilder", "datetime", "mediaInfo", "backdrop", "listView", "itemContextMenu", "itemHelper", "dom", "indicators", "apphost", "imageLoader", "libraryMenu", "globalize", "browser", "events", "scrollHelper", "playbackManager", "libraryBrowser", "scrollStyles", "emby-itemscontainer", "emby-checkbox", "emby-button", "emby-playstatebutton", "emby-ratingbutton", "emby-scroller", "emby-select"], function (loading, appRouter, layoutManager, userSettings, connectionManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager, libraryBrowser) { "use strict"; function getPromise(apiClient, params) { @@ -445,6 +445,20 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild } } + function enabled() { + return userSettings.enableBackdrops(); + } + + function renderBackdrop(page, item, apiClient) { + if (enabled()) { + if (dom.getWindowSize().innerWidth >= 1000) { + backdrop.setBackdrops([item]); + } else { + backdrop.clear(); + } + } + } + function renderDetailPageBackdrop(page, item, apiClient) { var imgUrl; var screenWidth = screen.availWidth; @@ -520,9 +534,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild setInitialCollapsibleState(page, item, apiClient, context, user); renderDetails(page, item, apiClient, context); renderTrackSelections(page, instance, item); - - backdrop.clear(); - + renderBackdrop(page, item, apiClient); renderDetailPageBackdrop(page, item, apiClient); var canPlay = reloadPlayButtons(page, item); From 81b78035c060ea72b63224a4d44bee12e092f454 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Fri, 29 Nov 2019 00:33:44 +0300 Subject: [PATCH 3/3] Revert back theme style --- src/components/themes/blueradiance/theme.css | 2 +- src/components/themes/dark/theme.css | 2 +- src/components/themes/emby/theme.css | 2 +- src/components/themes/purple-haze/theme.css | 2 +- src/components/themes/wmc/theme.css | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/themes/blueradiance/theme.css b/src/components/themes/blueradiance/theme.css index 1880abbf14..f450404bea 100644 --- a/src/components/themes/blueradiance/theme.css +++ b/src/components/themes/blueradiance/theme.css @@ -49,7 +49,7 @@ html { } .backgroundContainer.withBackdrop { - opacity: .60 + opacity: .86 } @media (orientation:portrait) { diff --git a/src/components/themes/dark/theme.css b/src/components/themes/dark/theme.css index 541dc3f3ed..b4d4bcda4b 100644 --- a/src/components/themes/dark/theme.css +++ b/src/components/themes/dark/theme.css @@ -36,7 +36,7 @@ html { } .backgroundContainer.withBackdrop { - background-color: rgba(0, 0, 0, 0.60) + background-color: rgba(0, 0, 0, .86) } .paper-icon-button-light:hover:not(:disabled) { diff --git a/src/components/themes/emby/theme.css b/src/components/themes/emby/theme.css index 15a2bbf6a9..7206150235 100644 --- a/src/components/themes/emby/theme.css +++ b/src/components/themes/emby/theme.css @@ -36,7 +36,7 @@ html { } .backgroundContainer.withBackdrop { - background-color: rgba(0, 0, 0, .60) + background-color: rgba(0, 0, 0, .86) } .paper-icon-button-light:hover:not(:disabled) { diff --git a/src/components/themes/purple-haze/theme.css b/src/components/themes/purple-haze/theme.css index 59591343ca..566af827ee 100644 --- a/src/components/themes/purple-haze/theme.css +++ b/src/components/themes/purple-haze/theme.css @@ -49,7 +49,7 @@ html { } .backgroundContainer.withBackdrop { - opacity: .60 + opacity: .86 } @media (orientation:portrait) { diff --git a/src/components/themes/wmc/theme.css b/src/components/themes/wmc/theme.css index cfa602f47e..a19eeb93a2 100644 --- a/src/components/themes/wmc/theme.css +++ b/src/components/themes/wmc/theme.css @@ -61,7 +61,7 @@ html { } .backgroundContainer.withBackdrop { - background: rgba(17, 98, 164, .60) + background: rgba(17, 98, 164, .9) } .paper-icon-button-light:hover:not(:disabled) {