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

update ui to dock value

Browse Source
v0.6
Michail Vourlakos 8 years ago
parent 6bf2890e54
commit bb9fc7db4a
4 changed files with 64 additions and 84 deletions
Show Stats Download Patch File Download Diff File

104
containment/contents/ui/VisibilityManager.qml
Unescape Escape View File

@ -37,30 +37,17 @@ Item{
property int thicknessZoomOriginal: statesLineSizeOriginal + ((plasmoid.configuration.iconSize+iconMarginOriginal) * root.zoomFactor) + 2
Binding{
//this is way to avoid warnings for null during initialization phase
target: window ? window.visibility : manager
target: dock.visibility
property:"panelVisibility"
when: window && window.visibility
value: plasmoid.configuration.panelVisibility
}
Binding{
target: window
target: dock
property:"maxThickness"
when: window
value: thicknessZoomOriginal
}
onWindowChanged: {
if(window) {
window.visibility.onDisableHidingChanged.connect(slotDisableHidingChanged);
window.visibility.onIsHoveredChanged.connect(slotIsHoveredChanged);
window.visibility.onMustBeLowered.connect(slotMustBeLowered);
window.visibility.onMustBeRaised.connect(slotMustBeRaised);
window.visibility.onMustBeRaisedImmediately.connect(slotMustBeRaisedImmediately);
window.visibility.onPanelVisibilityChanged.connect(slotPanelVisibilityChanged);
}
}
onInStartupChanged: {
if (!inStartup) {
@ -80,20 +67,29 @@ Item{
onThicknessZoomOriginalChanged: updateMaskArea();
Component.onCompleted: {
dock.visibility.onDisableHidingChanged.connect(slotDisableHidingChanged);
dock.visibility.onIsHoveredChanged.connect(slotIsHoveredChanged);
dock.visibility.onMustBeLowered.connect(slotMustBeLowered);
dock.visibility.onMustBeRaised.connect(slotMustBeRaised);
dock.visibility.onMustBeRaisedImmediately.connect(slotMustBeRaisedImmediately);
dock.visibility.onPanelVisibilityChanged.connect(slotPanelVisibilityChanged);
}
function slotDisableHidingChanged() {
if (!window.disableHiding) {
if (!dock.visibility.disableHiding) {
checkListHovered.restart();
}
}
function slotIsHoveredChanged() {
if(window.isHovered) {
if(dock.visibility.isHovered) {
//stop parent window timer for auto hiding
if ((window.visibility.panelVisibility === Latte.Dock.AutoHide)|| window.visibility.isDockWindowType) {
if ((dock.visibility.panelVisibility === Latte.Dock.AutoHide)|| dock.visibility.isDockWindowType) {
if(hideMagicWindowInAutoHide.forcedDisableHiding) {
hideMagicWindowInAutoHide.forcedDisableHiding = false;
window.visibility.disableHiding = false;
dock.visibility.disableHiding = false;
}
hideMagicWindowInAutoHide.stop();
@ -111,12 +107,10 @@ Item{
}
function slotMustBeRaised() {
if (window) {
if ((window.visibility.panelVisibility === Latte.Dock.AutoHide) || window.visibility.isDockWindowType) {
slidingAnimationAutoHiddenIn.init();
} else {
slidingAnimation.init(true,false);
}
if ((dock.visibility.panelVisibility === Latte.Dock.AutoHide) || dock.visibility.isDockWindowType) {
slidingAnimationAutoHiddenIn.init();
} else {
slidingAnimation.init(true,false);
}
}
@ -125,24 +119,22 @@ Item{
}
function slotMustBeLowered() {
if (window) {
if ((window.visibility.panelVisibility === Latte.Dock.AutoHide) || window.visibility.isDockWindowType ) {
if ((dock.visibility.panelVisibility === Latte.Dock.AutoHide) || dock.visibility.isDockWindowType ) {
slidingAnimationAutoHiddenOut.init();
} else {
slidingAnimation.init(false,false);
}
}
}
function slotPanelVisibilityChanged() {
if (window.visibility.panelVisibility !== Latte.Dock.AutoHide) {
window.visibility.isAutoHidden = false;
if (dock.visibility.panelVisibility !== Latte.Dock.AutoHide) {
dock.visibility.isAutoHidden = false;
}
}
///test maskArea
function updateMaskArea() {
if (!windowSystem.compositingActive || !window) {
if (!windowSystem.compositingActive) {
return;
}
@ -179,42 +171,42 @@ Item{
tempThickness = thicknessMidOriginal;
}
if (window.visibility.isAutoHidden && ((window.visibility.panelVisibility === Latte.Dock.AutoHide) || window.visibility.isDockWindowType)) {
if (dock.visibility.isAutoHidden && ((dock.visibility.panelVisibility === Latte.Dock.AutoHide) || dock.visibility.isDockWindowType)) {
tempThickness = thicknessAutoHidden;
}
//configure x,y based on plasmoid position and root.panelAlignment(Alignment)
if ((plasmoid.location === PlasmaCore.Types.BottomEdge) || (plasmoid.location === PlasmaCore.Types.TopEdge)) {
if (plasmoid.location === PlasmaCore.Types.BottomEdge) {
localY = window.height - tempThickness;
localY = dock.height - tempThickness;
} else if (plasmoid.location === PlasmaCore.Types.TopEdge) {
localY = 0;
}
if (plasmoid.configuration.panelPosition === Latte.Dock.Double) {
localX = (window.width/2) - (layoutsContainer.width/2) - 0.25*space;
localX = (dock.width/2) - (layoutsContainer.width/2) - 0.25*space;
} else if (root.panelAlignment === Latte.Dock.Left) {
localX = 0;
} else if (root.panelAlignment === Latte.Dock.Center) {
localX = (window.width/2) - (mainLayout.width/2) - (space/2);
localX = (dock.width/2) - (mainLayout.width/2) - (space/2);
} else if (root.panelAlignment === Latte.Dock.Right) {
localX = window.width - mainLayout.width - (space/2);
localX = dock.width - mainLayout.width - (space/2);
}
} else if ((plasmoid.location === PlasmaCore.Types.LeftEdge) || (plasmoid.location === PlasmaCore.Types.RightEdge)){
if (plasmoid.location === PlasmaCore.Types.LeftEdge) {
localX = 0;
} else if (plasmoid.location === PlasmaCore.Types.RightEdge) {
localX = window.width - tempThickness;
localX = dock.width - tempThickness;
}
if (plasmoid.configuration.panelPosition === Latte.Dock.Double) {
localY = (window.height/2) - (layoutsContainer.height/2) - 0.25*space;
localY = (dock.height/2) - (layoutsContainer.height/2) - 0.25*space;
} else if (root.panelAlignment === Latte.Dock.Top) {
localY = 0;
} else if (root.panelAlignment === Latte.Dock.Center) {
localY = (window.height/2) - (mainLayout.height/2) - (space/2);
localY = (dock.height/2) - (mainLayout.height/2) - (space/2);
} else if (root.panelAlignment === Latte.Dock.Bottom) {
localY = window.height - mainLayout.height - (space/2);
localY = dock.height - mainLayout.height - (space/2);
}
}
} else {
@ -233,15 +225,15 @@ Item{
//configure the x,y position based on thickness
if(plasmoid.location === PlasmaCore.Types.RightEdge)
localX = window.width - tempThickness;
localX = dock.width - tempThickness;
else if(plasmoid.location === PlasmaCore.Types.BottomEdge)
localY = window.height - tempThickness;
localY = dock.height - tempThickness;
} else{
//use all thickness space
tempThickness = thicknessZoomOriginal;
}
}
var maskArea = window.maskArea;
var maskArea = dock.maskArea;
var maskLength = maskArea.width; //in Horizontal
if (root.isVertical) {
@ -270,7 +262,7 @@ Item{
newMaskArea.height = tempLength;
}
window.maskArea = newMaskArea;
dock.maskArea = newMaskArea;
}
}
@ -290,10 +282,10 @@ Item{
}
Rectangle{
x: window ? window.maskArea.x : 0
y: window ? window.maskArea.y : 0
height: window ? window.maskArea.height : -1
width: window ? window.maskArea.width : -1
x: dock.maskArea.x
y: dock.maskArea.y
height: dock.maskArea.height
width: dock.maskArea.width
border.color: "green"
border.width: 1
@ -345,9 +337,9 @@ Item{
onInHalfChanged: {
if (inHalf) {
if (raiseFlag) {
window.visibility.showOnTop();
dock.visibility.showOnTop();
} else {
window.visibility.showOnBottom();
dock.visibility.showOnBottom();
}
}
}
@ -373,7 +365,7 @@ Item{
}
onStopped: {
window.visibility.isAutoHidden = true;
dock.visibility.isAutoHidden = true;
updateMaskArea();
}
@ -400,7 +392,7 @@ Item{
}
function init() {
window.visibility.isAutoHidden = false;
dock.visibility.isAutoHidden = false;
updateMaskArea();
start();
}
@ -409,10 +401,10 @@ Item{
///////////// External Connections //////
TaskManager.ActivityInfo {
onCurrentActivityChanged: {
window.visibility.disableHiding = true;
dock.visibility.disableHiding = true;
if (window.visibility.isAutoHidden) {
window.visibility.mustBeRaised();
if (dock.visibility.isAutoHidden) {
dock.visibility.mustBeRaised();
}
hideMagicWindowInAutoHide.forcedDisableHiding = true;
@ -439,7 +431,7 @@ Item{
interval: manager.inStartup ? 1000 : 500
onTriggered: {
layoutsContainer.opacity = 1;
if ((window.visibility.panelVisibility !== Latte.Dock.AutoHide) && !window.visibility.isDockWindowType) {
if ((dock.visibility.panelVisibility !== Latte.Dock.AutoHide) && !dock.visibility.isDockWindowType) {
slidingAnimation.init(true,false);
} else {
slidingAnimationAutoHiddenIn.init();

33
containment/contents/ui/main.qml
Unescape Escape View File

@ -92,7 +92,6 @@ DragDrop.DropArea {
property Item toolBox
property Item nowDockContainer
property Item nowDock
property QtObject dockView
// TO BE DELETED, if not needed: property int counter:0;
@ -420,7 +419,7 @@ DragDrop.DropArea {
onIsHoveredChanged: {
if (isHovered){
dockView.visibility.showOnTopCheck();
dock.visibility.showOnTopCheck();
}
}
@ -502,7 +501,6 @@ DragDrop.DropArea {
}
Plasmoid.onUserConfiguringChanged: {
console.log("user configuring:"+plasmoid.userConfiguring + " immutable:"+plasmoid.immutable);
if (plasmoid.immutable) {
if (dragOverlay) {
dragOverlay.destroy();
@ -539,7 +537,6 @@ DragDrop.DropArea {
Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart();
Plasmoid.onImmutableChanged: {
console.log("plasmoid immutable state: "+plasmoid.immutable);
containmentSizeSyncTimer.restart();
plasmoid.action("configure").visible = !plasmoid.immutable;
plasmoid.action("configure").enabled = !plasmoid.immutable;
@ -571,10 +568,10 @@ DragDrop.DropArea {
// magicWin.initialize();
}
dockView.visibility.disableHiding = false;
dock.visibility.disableHiding = false;
} else {
dockView.visibility.disableHiding = true;
dockView.visibility.mustBeRaised();
dock.visibility.disableHiding = true;
dock.visibility.mustBeRaised();
}
@ -731,7 +728,7 @@ DragDrop.DropArea {
animatedLengthTimer.start();
}
if (!dockView.visibility.isHovered && (root.animationsNeedBothAxis === 0)
if (!dock.visibility.isHovered && (root.animationsNeedBothAxis === 0)
&& (root.animationsNeedLength===0) && (root.appletsAnimations === 0)) {
mainLayout.animatedLength = true;
} else {
@ -743,7 +740,7 @@ DragDrop.DropArea {
function clearZoom(){
//console.log("Panel clear....");
if (dockView.visibility.disableHiding) {
if (dock.visibility.disableHiding) {
return;
}
@ -853,14 +850,14 @@ DragDrop.DropArea {
}
function slotDisableHiding(value) {
dockView.visibility.disableHiding = value;
dock.visibility.disableHiding = value;
}
function updateAutomaticIconSize() {
if (visibilityManager.normalState && !animatedLengthTimer.running && plasmoid.immutable
&& (iconSize===plasmoid.configuration.iconSize || iconSize === automaticIconSizeBasedSize) ) {
var layoutLength;
var maxLength = dockView.maxLength;
var maxLength = dock.maxLength;
// console.log("------Entered check-----");
if (root.isVertical) {
@ -1041,7 +1038,7 @@ DragDrop.DropArea {
VisibilityManager{
id: visibilityManager
window: dockView
window: dock
}
Item{
@ -1057,14 +1054,14 @@ DragDrop.DropArea {
x: (plasmoid.configuration.panelPosition === Latte.Dock.Double) && root.isHorizontal
&& plasmoid.immutable && windowSystem.compositingActive ?
(dockView.width/2) - (dockView.visibility.maxLength/2): 0
(dock.width/2) - (dock.visibility.maxLength/2): 0
y: (plasmoid.configuration.panelPosition === Latte.Dock.Double) && root.isVertical
&& plasmoid.immutable && windowSystem.compositingActive ?
(dockView.height/2) - (dockView.visibility.maxLength/2): 0
(dock.height/2) - (dock.visibility.maxLength/2): 0
width: (plasmoid.configuration.panelPosition === Latte.Dock.Double) && root.isHorizontal && plasmoid.immutable ?
dockView.visibility.maxLength : parent.width
dock.visibility.maxLength : parent.width
height: (plasmoid.configuration.panelPosition === Latte.Dock.Double) && root.isVertical && plasmoid.immutable ?
dockView.visibility.maxLength : parent.height
dock.visibility.maxLength : parent.height
Component.onCompleted: {
if(plasmoid.immutable) {
@ -1226,10 +1223,10 @@ DragDrop.DropArea {
onTriggered: {
if (forcedDisableHiding) {
forcedDisableHiding = false;
dockView.visibility.disableHiding = false;
dock.visibility.disableHiding = false;
}
var visibility = dockView.visibility;
var visibility = dock.visibility;
if (plasmoid.immutable && !visibility.isHovered //&& !wholeArea.containsMouse
&& ((visibility.panelVisibility === Latte.Dock.AutoHide) || visibility.isDockWindowType) ) {

1
corona/nowdockview.cpp
Unescape Escape View File

@ -25,6 +25,7 @@
#include <QAction>
#include <QQmlContext>
#include <QQmlEngine>
#include <QQmlProperty>
#include <QQuickItem>
#include <QMetaEnum>

10
shell/contents/views/Panel.qml
Unescape Escape View File

@ -30,10 +30,7 @@ PlasmaCore.FrameSvgItem {
prefix:""
// onRepaintNeeded: adjustPrefix();
//enabledBorders: panel.enabledBorders
property Item containment
property Item dockLayout
readonly property bool verticalPanel: containment && containment.formFactor === PlasmaCore.Types.Vertical
@ -81,13 +78,6 @@ PlasmaCore.FrameSvgItem {
containment.anchors.fill = containmentParent;
containment.locationChanged.connect(adjustPrefix);
adjustPrefix();
for(var i=0; i<containment.children.length; ++i){
if (containment.children[i].objectName === "dockLayoutView") {
dockLayout = containment.children[i];
dockLayout.dockView = panel;
}
}
}
Binding {

Write Preview
Loading…
Cancel
Save