mirror of
https://github.com/KDE/latte-dock.git
synced 2025-01-18 02:04:32 +03:00
update solid option to solid style
--Solid Style option is just a way to use the Solid svg from the plasma theme
This commit is contained in:
parent
38ab6b67bb
commit
387939bd0a
@ -306,13 +306,11 @@ Item{
|
||||
}
|
||||
}
|
||||
|
||||
readonly property bool forceSolidness: (root.solidPanel && !plasmoid.configuration.solidBackgroundForMaximized)
|
||||
|| root.forceSolidPanel
|
||||
|| !Latte.WindowSystem.compositingActive
|
||||
readonly property bool forceSolidness: root.forceSolidPanel || !Latte.WindowSystem.compositingActive
|
||||
|
||||
property rect efGeometry: Qt.rect(-1,-1,0,0)
|
||||
|
||||
imagePath: root.solidPanel ? "opaque/dialogs/background" : "widgets/panel-background"
|
||||
imagePath: root.solidStylePanel ? "opaque/dialogs/background" : "widgets/panel-background"
|
||||
|
||||
onWidthChanged: updateEffectsArea();
|
||||
onHeightChanged: updateEffectsArea();
|
||||
@ -341,7 +339,7 @@ Item{
|
||||
}
|
||||
}
|
||||
|
||||
onSolidPanelChanged: {
|
||||
onSolidStylePanelChanged: {
|
||||
solidBackground.adjustPrefix();
|
||||
}
|
||||
}
|
||||
@ -385,7 +383,7 @@ Item{
|
||||
//! the increases used when the user forces a solid background and the background
|
||||
//! must be increased in order to look ok in the corners
|
||||
property int rightIncreaser: {
|
||||
if (!(root.solidPanel && root.isVertical && plasmoid.location === PlasmaCore.Types.LeftEdge)
|
||||
if (!(root.solidStylePanel && root.isVertical && plasmoid.location === PlasmaCore.Types.LeftEdge)
|
||||
|| !Latte.WindowSystem.compositingActive)
|
||||
return 0;
|
||||
else
|
||||
@ -393,7 +391,7 @@ Item{
|
||||
}
|
||||
|
||||
property int leftIncreaser: {
|
||||
if (!(root.solidPanel && root.isVertical && plasmoid.location === PlasmaCore.Types.RightEdge)
|
||||
if (!(root.solidStylePanel && root.isVertical && plasmoid.location === PlasmaCore.Types.RightEdge)
|
||||
|| !Latte.WindowSystem.compositingActive)
|
||||
return 0;
|
||||
else
|
||||
@ -401,7 +399,7 @@ Item{
|
||||
}
|
||||
|
||||
property int topIncreaser: {
|
||||
if (!(root.solidPanel && root.isVertical && plasmoid.location === PlasmaCore.Types.BottomEdge)
|
||||
if (!(root.solidStylePanel && root.isVertical && plasmoid.location === PlasmaCore.Types.BottomEdge)
|
||||
|| !Latte.WindowSystem.compositingActive)
|
||||
return 0;
|
||||
else
|
||||
@ -409,7 +407,7 @@ Item{
|
||||
}
|
||||
|
||||
property int bottomIncreaser: {
|
||||
if (!(root.solidPanel && root.isVertical && plasmoid.location === PlasmaCore.Types.TopEdge)
|
||||
if (!(root.solidStylePanel && root.isVertical && plasmoid.location === PlasmaCore.Types.TopEdge)
|
||||
|| !Latte.WindowSystem.compositingActive)
|
||||
return 0;
|
||||
else
|
||||
|
@ -31,7 +31,8 @@ Loader{
|
||||
|
||||
active: forceColorizer || forceSolidnessAndColorize
|
||||
|
||||
readonly property bool forceSolidness: (root.solidPanel && !plasmoid.configuration.solidBackgroundForMaximized) || root.forceSolidPanel
|
||||
readonly property bool forceSolidness: (root.solidStylePanel && !plasmoid.configuration.solidBackgroundForMaximized)
|
||||
|| root.forceSolidPanel
|
||||
|| !Latte.WindowSystem.compositingActive
|
||||
readonly property bool forceSolidnessAndColorize: forceSolidness && forceColorizeFromActiveWindowScheme
|
||||
|
||||
@ -42,7 +43,7 @@ Loader{
|
||||
|
||||
readonly property color minimizedDotColor: themeTextColorBrightness > 127.5 ? Qt.darker(theme.textColor, 1.7) : Qt.lighter(theme.textColor, 7)
|
||||
|
||||
property bool mustBeShown: active && (!forceSolidPanel || forceSolidnessAndColorize)
|
||||
property bool mustBeShown: active && (!root.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))
|
||||
|
@ -74,7 +74,7 @@ DragDrop.DropArea {
|
||||
|
||||
return (visibilityManager.panelIsBiggerFromIconSize && (zoomFactor === 1.0)
|
||||
&& (latteView.visibility.mode === Latte.Types.AlwaysVisible || latteView.visibility.mode === Latte.Types.WindowsGoBelow)
|
||||
&& (plasmoid.configuration.panelPosition === Latte.Types.Justify) && !(root.solidPanel && panelShadowsActive));
|
||||
&& (plasmoid.configuration.panelPosition === Latte.Types.Justify) && !(root.solidStylePanel && panelShadowsActive));
|
||||
}
|
||||
|
||||
property bool blurEnabled: plasmoid.configuration.blurEnabled && (!root.forceTransparentPanel || root.forcePanelForBusyBackground)
|
||||
@ -149,7 +149,7 @@ DragDrop.DropArea {
|
||||
property bool showAppletsNumbers: false
|
||||
property bool showMetaBadge: false
|
||||
property int applicationLauncherId: -1
|
||||
property bool solidPanel: Latte.WindowSystem.compositingActive ? plasmoid.configuration.solidPanel : true
|
||||
property bool solidStylePanel: Latte.WindowSystem.compositingActive ? plasmoid.configuration.solidPanel : true
|
||||
|
||||
//FIXME: possibly this is going to be the default behavior, this user choice
|
||||
//has been dropped from the Dock Configuration Window
|
||||
@ -225,7 +225,7 @@ DragDrop.DropArea {
|
||||
if (hasExpandedApplet
|
||||
&& zoomFactor===1
|
||||
&& plasmoid.configuration.panelSize===100
|
||||
&& !(root.solidPanel && !plasmoid.configuration.panelShadows) ) {
|
||||
&& !(root.solidStylePanel && !plasmoid.configuration.panelShadows) ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -431,8 +431,6 @@ PlasmaComponents.Page {
|
||||
LatteExtraControls.Slider {
|
||||
id: transparencySlider
|
||||
Layout.fillWidth: true
|
||||
//! transparency can be set when the user doesn't want solidness all the time
|
||||
//! or when the user wants solidness only for maximized windows
|
||||
enabled: showBackground.checked //&& !blockOpacityAdjustment
|
||||
|
||||
value: plasmoid.configuration.panelTransparency
|
||||
@ -487,6 +485,7 @@ PlasmaComponents.Page {
|
||||
checked: plasmoid.configuration.blurEnabled
|
||||
checkable: true
|
||||
enabled: showBackground.checked
|
||||
tooltip: i18n("Background is blurred underneath")
|
||||
|
||||
onClicked: {
|
||||
plasmoid.configuration.blurEnabled = checked
|
||||
@ -500,6 +499,7 @@ PlasmaComponents.Page {
|
||||
checked: plasmoid.configuration.panelShadows
|
||||
checkable: true
|
||||
enabled: showBackground.checked
|
||||
tooltip: i18n("Background shows its shadows")
|
||||
|
||||
onClicked: {
|
||||
plasmoid.configuration.panelShadows = checked
|
||||
@ -509,10 +509,11 @@ PlasmaComponents.Page {
|
||||
PlasmaComponents.Button {
|
||||
id: solidBackground
|
||||
Layout.fillWidth: true
|
||||
text: i18n("Solid")
|
||||
text: i18n("Solid Style")
|
||||
checked: plasmoid.configuration.solidPanel
|
||||
checkable: true
|
||||
enabled: showBackground.checked
|
||||
tooltip: i18n("Background uses solid style image provided from plasma theme")
|
||||
|
||||
onClicked: {
|
||||
plasmoid.configuration.solidPanel = checked
|
||||
|
Loading…
x
Reference in New Issue
Block a user