github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move colorizeManager to its own Item class

Browse Source
pull/3/head
Michail Vourlakos 6 years ago
parent 4b55cdce52
commit 9374ff3cc4
6 changed files with 200 additions and 167 deletions
Show Stats Download Patch File Download Diff File

4
containment/package/contents/ui/applet/AppletItem.qml
Unescape Escape View File

@ -546,7 +546,7 @@ Item {
wrapMode: Text.WordWrap
elide: Text.ElideRight
fontSizeMode: Text.Fit
color: colorizerManagerLoader.themeBrightColor
color: colorizerManager.themeBrightColor
rotation: {
if (root.isHorizontal)
@ -565,7 +565,7 @@ Item {
anchors.fill: parent
opacity: mustBeShown ? 1 : 0
readonly property bool mustBeShown: colorizerManagerLoader.mustBeShown
readonly property bool mustBeShown: colorizerManager.mustBeShown
&& !communicator.disableLatteSideColoring
Behavior on opacity {

4
containment/package/contents/ui/applet/Communicator.qml
Unescape Escape View File

@ -157,14 +157,14 @@ Item{
target: appletRootItem
property: "applyLattePalette"
when: disableLatteSideColoring && appletCanUseLattePalette
value: colorizerManagerLoader.mustBeShown
value: colorizerManager.mustBeShown
}
Binding{
target: appletRootItem
property: "lattePalette"
when: disableLatteSideColoring && appletCanUseLattePalette
value: colorizerManagerLoader
value: colorizerManager
//value: dock && dock.visibility ? dock.visibility.touchingWindowScheme : null
}
//! END OF BINDINGS

2
containment/package/contents/ui/colorizer/Applet.qml
Unescape Escape View File

@ -27,7 +27,7 @@ Item {
ColorOverlay {
id: colorizer
anchors.fill: parent
color: colorizerManagerLoader.applyColor
color: colorizerManager.applyColor
source: appletFlow
}

83
containment/package/contents/ui/colorizer/BackgroundTracker.qml
Unescape Escape View File

@ -0,0 +1,83 @@
/*
* Copyright 2018 Michail Vourlakos <mvourlakos@gmail.com>
*
* This file is part of Latte-Dock
*
* Latte-Dock is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* Latte-Dock is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.7
import QtGraphicalEffects 1.0
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
Item{
id: tracker
property real currentBackgroundLuminas: -1000;
Connections{
target: plasmoid
onLocationChanged:{
tracker.currentBackgroundLuminas = universalSettings.luminasFromFile(activitiesList.currentLayoutBackground, plasmoid.location);
}
}
Repeater {
id: activitiesList
model: universalSettings ? universalSettings.runningActivitiesModel : null
property string currentLayoutBackground: ""
onCurrentLayoutBackgroundChanged: {
tracker.currentBackgroundLuminas = universalSettings.luminasFromFile(currentLayoutBackground, plasmoid.location);
}
Item {
id: activityItem
visible: false
property string activityId: model.id
property string title: model.name
property string background: model.background
property bool current: model.isCurrent
Component.onCompleted: {
if (dockManagedLayout && forceColorizer && dockManagedLayout.lastUsedActivity === activityId) {
activitiesList.currentLayoutBackground = background;
}
}
onBackgroundChanged: {
if (dockManagedLayout && forceColorizer && dockManagedLayout.lastUsedActivity === activityId) {
activitiesList.currentLayoutBackground = background;
}
}
Connections{
target: dockManagedLayout
onLastUsedActivityChanged:{
if (dockManagedLayout && forceColorizer && dockManagedLayout.lastUsedActivity === activityItem.activityId) {
activitiesList.currentLayoutBackground = activityItem.background;
}
}
}
}
}
}

144
containment/package/contents/ui/colorizer/Manager.qml
Unescape Escape View File

@ -18,62 +18,136 @@
*/
import QtQuick 2.7
import QtGraphicalEffects 1.0
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.latte 0.1 as Latte
Item{
Connections{
target: plasmoid
onLocationChanged:{
colorizerManagerLoader.currentBackgroundLuminas = universalSettings.luminasFromFile(activitiesList.currentLayoutBackground, plasmoid.location);
Loader{
id: manager
active: forceColorizer || forceSolidnessAndColorize
readonly property bool forceSolidness: (root.solidPanel && !plasmoid.configuration.solidBackgroundForMaximized) || root.forceSolidPanel
|| !Latte.WindowSystem.compositingActive
readonly property bool forceSolidnessAndColorize: forceSolidness && forceColorizeFromActiveWindowScheme
// formula for luminance according to:
// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
property real textColorRs: {
var color = theme.textColor.r;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
Repeater {
id: activitiesList
model: universalSettings ? universalSettings.runningActivitiesModel : null
property real textColorGs: {
var color = theme.textColor.g;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
property string currentLayoutBackground: ""
property real textColorBs: {
var color = theme.textColor.b;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
onCurrentLayoutBackgroundChanged: {
colorizerManagerLoader.currentBackgroundLuminas = universalSettings.luminasFromFile(currentLayoutBackground, plasmoid.location);
//! -------
property real backColorRs: {
var color = theme.backgroundColor.r;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
Item {
id: activityItem
visible: false
property real backColorGs: {
var color = theme.backgroundColor.g;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
property string activityId: model.id
property string title: model.name
property string background: model.background
property bool current: model.isCurrent
property real backColorBs: {
var color = theme.backgroundColor.b;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
Component.onCompleted: {
if (dockManagedLayout && forceColorizer && dockManagedLayout.lastUsedActivity === activityId) {
activitiesList.currentLayoutBackground = background;
}
}
readonly property real themeBackgroundColorLuma: 0.2126*backColorRs + 0.7152*backColorGs + 0.0722*backColorBs
readonly property real themeTextColorLuma: 0.2126*textColorRs + 0.7152*textColorGs + 0.0722*textColorBs
readonly property color minimizedDotColor: themeTextColorLuma > 0.6 ? Qt.darker(theme.textColor, 1.7) : Qt.lighter(theme.textColor, 7)
onBackgroundChanged: {
if (dockManagedLayout && forceColorizer && dockManagedLayout.lastUsedActivity === activityId) {
activitiesList.currentLayoutBackground = background;
}
property bool mustBeShown: active && (!forceSolidPanel || forceSolidnessAndColorize)
//! when forceSemiTransparentPanel is enabled because of snapped or maximized etc. windows
//! then the colorizer could be enabled for low panel transparency levels (<40%)
&& (!userShowPanelBackground || !forceSemiTransparentPanel || (forceSemiTransparentPanel && root.panelTransparency<40))
&& !maximizedWindowTitleBarBehavesAsPanelBackground
&& (plasmoid.configuration.solidBackgroundForMaximized || plasmoid.configuration.backgroundOnlyOnMaximized)
&& !root.editMode && Latte.WindowSystem.compositingActive
property real currentBackgroundLuminas: item ? item.currentBackgroundLuminas : -1000
property color themeBrightColor: themeBackgroundColorLuma > themeTextColorLuma ? theme.backgroundColor : theme.textColor
property color themeDarkColor: themeBackgroundColorLuma > themeTextColorLuma ? theme.textColor : theme.backgroundColor
property color applyColor: {
if (forceSolidnessAndColorize && dock.visibility.touchingWindowScheme) {
return dock.visibility.touchingWindowScheme.textColor;
}
if (currentBackgroundLuminas>=0) {
var textAbs = Math.abs(themeTextColorLuma - currentBackgroundLuminas);
var backAbs = Math.abs(themeBackgroundColorLuma - currentBackgroundLuminas);
if (textAbs > backAbs) {
return Qt.rgba(theme.textColor.r, theme.textColor.g, theme.textColor.b , 1); //remove any transparency
}
}
Connections{
target: dockManagedLayout
return Qt.rgba(theme.backgroundColor.r, theme.backgroundColor.g, theme.backgroundColor.b, 1); //remove any transparency
}
//! new TEMPORARY options to pass palette to applets
//! UNTIL Latte produces two different color schemes files (LIGHT / DARK)
//! to be passed to applets etc...
readonly property color textColor: applyColor
readonly property color highlightColor: theme.highlightColor
readonly property color highlightedTextColor: theme.highlightedTextColor
readonly property color backgroundColor: {
if (forceSolidnessAndColorize && dock.visibility.touchingWindowScheme) {
return dock.visibility.touchingWindowScheme.backgroundColor;
}
if (currentBackgroundLuminas>=0) {
var textAbs = Math.abs(themeTextColorLuma - currentBackgroundLuminas);
var backAbs = Math.abs(themeBackgroundColorLuma - currentBackgroundLuminas);
onLastUsedActivityChanged:{
if (dockManagedLayout && forceColorizer && dockManagedLayout.lastUsedActivity === activityItem.activityId) {
activitiesList.currentLayoutBackground = activityItem.background;
}
}
if (textAbs > backAbs) {
return Qt.rgba(theme.backgroundColor.r, theme.backgroundColor.g, theme.backgroundColor.b , 1); //remove any transparency
}
}
return Qt.rgba(theme.textColor.r, theme.textColor.g, theme.textColor.b, 1); //remove any transparency
}
sourceComponent: BackgroundTracker{}
}

130
containment/package/contents/ui/main.qml
Unescape Escape View File

@ -409,7 +409,7 @@ DragDrop.DropArea {
property rect screenGeometry: dock ? dock.screenGeometry : plasmoid.screenGeometry
readonly property color minimizedDotColor: colorizerManagerLoader.minimizedDotColor
readonly property color minimizedDotColor: colorizerManager.minimizedDotColor
///END properties from latteApplet
/* Layout.preferredWidth: plasmoid.immutable ?
@ -1732,132 +1732,8 @@ DragDrop.DropArea {
id: layoutsContainer
}
Loader{
id: colorizerManagerLoader
active: forceColorizer || forceSolidnessAndColorize
readonly property bool forceSolidness: (root.solidPanel && !plasmoid.configuration.solidBackgroundForMaximized) || root.forceSolidPanel
|| !Latte.WindowSystem.compositingActive
readonly property bool forceSolidnessAndColorize: forceSolidness && forceColorizeFromActiveWindowScheme
// formula for luminance according to:
// https://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
property real textColorRs: {
var color = theme.textColor.r;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
property real textColorGs: {
var color = theme.textColor.g;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
property real textColorBs: {
var color = theme.textColor.b;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
//! -------
property real backColorRs: {
var color = theme.backgroundColor.r;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
property real backColorGs: {
var color = theme.backgroundColor.g;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
property real backColorBs: {
var color = theme.backgroundColor.b;
if (color <= 0.03928) {
return color / 12.92;
} else {
return Math.pow( ((color + 0.055) / 1.055), 2.4 );
}
}
readonly property real themeBackgroundColorLuma: 0.2126*backColorRs + 0.7152*backColorGs + 0.0722*backColorBs
readonly property real themeTextColorLuma: 0.2126*textColorRs + 0.7152*textColorGs + 0.0722*textColorBs
readonly property color minimizedDotColor: themeTextColorLuma > 0.6 ? Qt.darker(theme.textColor, 1.7) : Qt.lighter(theme.textColor, 7)
property bool mustBeShown: active && (!forceSolidPanel || forceSolidnessAndColorize)
//! when forceSemiTransparentPanel is enabled because of snapped or maximized etc. windows
//! then the colorizer could be enabled for low panel transparency levels (<40%)
&& (!userShowPanelBackground || !forceSemiTransparentPanel || (forceSemiTransparentPanel && root.panelTransparency<40))
&& !maximizedWindowTitleBarBehavesAsPanelBackground
&& (plasmoid.configuration.solidBackgroundForMaximized || plasmoid.configuration.backgroundOnlyOnMaximized)
&& !root.editMode && Latte.WindowSystem.compositingActive
property real currentBackgroundLuminas: -1000
property color themeBrightColor: themeBackgroundColorLuma > themeTextColorLuma ? theme.backgroundColor : theme.textColor
property color themeDarkColor: themeBackgroundColorLuma > themeTextColorLuma ? theme.textColor : theme.backgroundColor
property color applyColor: {
if (forceSolidnessAndColorize && dock.visibility.touchingWindowScheme) {
return dock.visibility.touchingWindowScheme.textColor;
}
if (currentBackgroundLuminas>=0) {
var textAbs = Math.abs(themeTextColorLuma - currentBackgroundLuminas);
var backAbs = Math.abs(themeBackgroundColorLuma - currentBackgroundLuminas);
if (textAbs > backAbs) {
return Qt.rgba(theme.textColor.r, theme.textColor.g, theme.textColor.b , 1); //remove any transparency
}
}
return Qt.rgba(theme.backgroundColor.r, theme.backgroundColor.g, theme.backgroundColor.b, 1); //remove any transparency
}
//! new TEMPORARY options to pass palette to applets
//! UNTIL Latte produces two different color schemes files (LIGHT / DARK)
//! to be passed to applets etc...
readonly property color textColor: applyColor
readonly property color highlightColor: theme.highlightColor
readonly property color highlightedTextColor: theme.highlightedTextColor
readonly property color backgroundColor: {
if (forceSolidnessAndColorize && dock.visibility.touchingWindowScheme) {
return dock.visibility.touchingWindowScheme.backgroundColor;
}
if (currentBackgroundLuminas>=0) {
var textAbs = Math.abs(themeTextColorLuma - currentBackgroundLuminas);
var backAbs = Math.abs(themeBackgroundColorLuma - currentBackgroundLuminas);
if (textAbs > backAbs) {
return Qt.rgba(theme.backgroundColor.r, theme.backgroundColor.g, theme.backgroundColor.b , 1); //remove any transparency
}
}
return Qt.rgba(theme.textColor.r, theme.textColor.g, theme.textColor.b, 1); //remove any transparency
}
sourceComponent: Colorizer.Manager{}
Colorizer.Manager {
id: colorizerManager
}
///////////////END UI elements

Write Preview
Loading…
Cancel
Save