kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-21 22:50:14 +03:00
Code Issues Projects Releases Wiki Activity

expose margins in plasmoid root object

Browse Source
This commit is contained in:
Michail Vourlakos 2017-04-28 20:20:44 +03:00
parent d0b2ce8c0f
commit 2a006177e7
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plasmoid/contents/ui/TaskDelegate.qml
View File

@ -272,9 +272,9 @@ MouseArea{
if (mainItemContainer.isSeparator){
if (!root.vertical)
return 5 + widthMargins;
return 5 + root.widthMargins;
else
return (root.iconSize + widthMargins) * mScale + root.statesLineSize;
return (root.iconSize + root.widthMargins) * mScale + root.statesLineSize;
}
if (mainItemContainer.isStartup && root.durationTime !==0 )
@ -289,9 +289,9 @@ MouseArea{
if (mainItemContainer.isSeparator){
if (root.vertical)
return 5 + heightMargins;
return 5 + root.heightMargins;
else
return (root.iconSize + heightMargins) * mScale + root.statesLineSize;
return (root.iconSize + root.heightMargins) * mScale + root.statesLineSize;
}
if (mainItemContainer.isStartup && root.durationTime !==0)
@ -319,15 +319,11 @@ MouseArea{
property real scaleWidth: (inTempScaling == true) ? tempScaleWidth : mScale
property real scaleHeight: (inTempScaling == true) ? tempScaleHeight : mScale
///Dont use Math.floor it adds one pixel in animations and creates glitches
property int widthMargins: root.vertical ? root.thickMargin : root.iconMargin
property int heightMargins: !root.vertical ? root.thickMargin : root.iconMargin
property real cleanScalingWidth: (root.iconSize + root.widthMargins) * mScale
property real cleanScalingHeight: (root.iconSize + root.heightMargins) * mScale
property real cleanScalingWidth: (root.iconSize + widthMargins) * mScale
property real cleanScalingHeight: (root.iconSize + heightMargins) * mScale
property real basicScalingWidth : (inTempScaling == true) ? ((root.iconSize + widthMargins) * scaleWidth) : cleanScalingWidth
property real basicScalingHeight : (inTempScaling == true) ? ((root.iconSize + heightMargins) * scaleHeight) : cleanScalingHeight
property real basicScalingWidth : (inTempScaling == true) ? ((root.iconSize + root.widthMargins) * scaleWidth) : cleanScalingWidth
property real basicScalingHeight : (inTempScaling == true) ? ((root.iconSize + root.heightMargins) * scaleHeight) : cleanScalingHeight
property real regulatorWidth: mainItemContainer.isSeparator ? separatorRegWidth : basicScalingWidth;
property real regulatorHeight: mainItemContainer.isSeparator ? separatorRegHeight : basicScalingHeight;
@ -337,7 +333,7 @@ MouseArea{
return;
if (!root.vertical)
return 5 + widthMargins;
return 5 + root.widthMargins;
else
return (root.iconSize + root.thickMargin) * mScale;
}
@ -347,25 +343,10 @@ MouseArea{
return;
if (root.vertical)
return 5 + heightMargins;
return 5 + root.heightMargins;
else
return (root.iconSize + root.thickMargin) * mScale;
}
property int maxSeparatorLength: {
if (root.vertical)
return 5 + wrapper.heightMargins;
else
return 5 + wrapper.widthMargins;
}
property real missingSeparatorLength: {
if (!root.isVertical)
return ((root.iconSize + widthMargins) * root.zoomFactor) - maxSeparatorLength;
else
return ((root.iconSize + heightMargins) * root.zoomFactor) - maxSeparatorLength;
}
/// end of Scalers///////
//property int curIndex: icList.hoveredIndex
@ -455,7 +436,7 @@ MouseArea{
if(mainItemContainer.isSeparator){
//minimumZoom for separator item
var tempZoomDifference = (wrapper.missingSeparatorLength / (wrapper.maxSeparatorLength+wrapper.missingSeparatorLength)) * root.zoomFactor;
var tempZoomDifference = (root.missingSeparatorLength / (root.maxSeparatorLength+root.missingSeparatorLength)) * root.zoomFactor;
minimumZoom = tempZoomDifference;
}
@ -490,7 +471,7 @@ MouseArea{
if(root.internalSeparatorPos>=0) {
if((root.internalSeparatorPos === index+1) || (root.internalSeparatorPos === index-1) ){
var sepZoomDifference = (wrapper.maxSeparatorLength / (wrapper.maxSeparatorLength+wrapper.missingSeparatorLength)) * root.zoomFactor;
var sepZoomDifference = (root.maxSeparatorLength / (root.maxSeparatorLength+root.missingSeparatorLength)) * root.zoomFactor;
bsNeighbourZoom = Math.max(1,bigNeighbourZoom - sepZoomDifference);
ssNeighbourZoom = Math.max(1,smallNeighbourZoom - sepZoomDifference);

20
plasmoid/contents/ui/main.qml
View File

@ -82,6 +82,10 @@ Item {
property int tasksStarting: 0
property int realSize: iconSize + iconMargin
///Dont use Math.floor it adds one pixel in animations and creates glitches
property int widthMargins: root.vertical ? thickMargin : iconMargin
property int heightMargins: !root.vertical ? thickMargin : iconMargin
property real textColorLuma: 0.2126*theme.textColor.r + 0.7152*theme.textColor.g + 0.0722*theme.textColor.b
//a small badgers record (id,value)
@ -98,6 +102,22 @@ Item {
property color minimizedDotColor: textColorLuma > 0.5 ? Qt.darker(theme.textColor, 1+ (1-textColorLuma)) : Qt.lighter(theme.textColor, 1+(1-textColorLuma))
//separator calculations based on audoban's design
property int maxSeparatorLength: {
if (root.vertical)
return 5 + heightMargins;
else
return 5 + widthMargins;
}
property real missingSeparatorLength: {
if (!root.isVertical)
return ((iconSize + widthMargins) * zoomFactor) - maxSeparatorLength;
else
return ((iconSize + heightMargins) * zoomFactor) - maxSeparatorLength;
}
//! it is used to play the animation correct when the user removes a launcher
property string launcherForRemoval: ""