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

improve systray positioning and alignment

Browse Source
This commit is contained in:
Michail Vourlakos 2017-04-23 03:36:24 +03:00
parent 4f85b916f8
commit c15bf2ccd6
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
containment/contents/ui/AppletItem.qml
View File

@ -46,8 +46,8 @@ Item {
return false;
if (((root.isHorizontal && applet.Layout.fillWidth===true)
|| (root.isVertical && applet.Layout.fillHeight===true))
&& (applet.status !== PlasmaCore.Types.HiddenStatus))
|| (root.isVertical && applet.Layout.fillHeight===true))
&& (applet.status !== PlasmaCore.Types.HiddenStatus))
return true;
else
return false;
@ -96,7 +96,7 @@ Item {
property Item applet
property Item latteApplet: applet && (applet.pluginName === root.plasmoidName) ?
(applet.children[0] ? applet.children[0] : null) : null
(applet.children[0] ? applet.children[0] : null) : null
property Item appletWrapper: applet &&
((applet.pluginName === root.plasmoidName) ||
(applet.pluginName === "org.kde.plasma.systemtray")) ? wrapper : wrapperContainer
@ -176,10 +176,10 @@ Item {
}
function clearZoom(){
if (restoreAnimation)
restoreAnimation.start();
// if(wrapper)
// wrapper.zoomScale = 1;
if (restoreAnimation)
restoreAnimation.start();
// if(wrapper)
// wrapper.zoomScale = 1;
}
function checkCanBeHovered(){
@ -426,8 +426,12 @@ Item {
property int iconSize: root.iconSize
property int marginWidth: root.isVertical ? root.thickMargin : root.iconMargin
property int marginHeight: root.isHorizontal ? root.thickMargin : root.iconMargin
property int marginWidth: root.isVertical ?
(applet && (applet.pluginName === "org.kde.plasma.systemtray") ? root.thickMarginBase : root.thickMargin ) :
root.iconMargin
property int marginHeight: root.isHorizontal ?
(applet && (applet.pluginName === "org.kde.plasma.systemtray") ? root.thickMarginBase : root.thickMargin ) :
root.iconMargin
property real scaledWidth: zoomScaleWidth * (layoutWidth + marginWidth)
property real scaledHeight: zoomScaleHeight * (layoutHeight + marginHeight)
@ -511,7 +515,7 @@ Item {
onZoomScaleChanged: {
if ((zoomScale === root.zoomFactor) && !enableDirectRenderTimer.running && !layoutsContainer.directRender) {
enableDirectRenderTimer.start();
enableDirectRenderTimer.start();
}
if ((zoomScale > 1) && !container.isZoomed) {
@ -571,7 +575,7 @@ Item {
&& ( (applet.Layout.maximumHeight < root.iconSize) || (applet.Layout.preferredHeight > root.iconSize))
&& root.isVertical
&& !disableScaleWidth ) {
//&& !root.editMode ){
//&& !root.editMode ){
disableScaleHeight = true;
//this way improves performance, probably because during animation the preferred sizes update a lot
if((applet.Layout.maximumHeight < root.iconSize)){
@ -614,7 +618,7 @@ Item {
&& ( (applet.Layout.maximumWidth < root.iconSize) || (applet.Layout.preferredWidth > root.iconSize))
&& root.isHorizontal
&& !disableScaleHeight ){
// && !root.editMode){
// && !root.editMode){
disableScaleWidth = true;
//this way improves performance, probably because during animation the preferred sizes update a lot
if((applet.Layout.maximumWidth < root.iconSize)){