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

fix #83,support fake iconitem and container

Browse Source 
--there are plasma widgets that break the Latte
experience concerning the parabolic effect. We fix
this by providing above them our own Latte solution
and by hiding the applets appearance. At the same
time we make sure that a folder widget is not increasing
its size above 96px. for which its appearance goes to
FullRepresentation
This commit is contained in:
Michail Vourlakos 2017-05-16 19:37:09 +03:00
parent 33aa55271d
commit 17db2a8a5d
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
containment/package/contents/ui/AppletItem.qml
View File

@ -101,6 +101,10 @@ Item {
(applet.pluginName === "org.kde.plasma.systemtray")) ? wrapper : wrapperContainer
property Item appletIconItem; //first applet's IconItem, to be activated onExit signal
//this is used for folderView and icon widgets to fake their visual
property bool fakeIconItem: applet && appletIconItem
&& (applet.pluginName === "org.kde.plasma.folder" || applet.pluginName === "org.kde.plasma.icon")
property alias containsMouse: appletMouseArea.containsMouse
property alias pressed: appletMouseArea.pressed
@ -109,6 +113,25 @@ Item {
console.log(computeHeight);
}*/
//set up the fake containers and properties for when a fakeIconItem must be presented to the user
//because the plasma widgets specific implementation breaks the Latte experience
onFakeIconItemChanged: {
if (fakeIconItem) {
applet.opacity = 0;
if (applet.pluginName === "org.kde.plasma.folder") {
applet.parent = fakeIconItemContainer;
applet.anchors.fill = fakeIconItemContainer;
}
wrapper.disableScaleWidth = false;
wrapper.disableScaleHeight = false;
wrapper.updateLayoutWidth();
wrapper.updateLayoutHeight();
}
}
onIndexChanged: {
if (container.latteApplet) {
root.latteAppletPos = index;
@ -558,7 +581,7 @@ Item {
layoutHeight = root.statesLineSize + root.iconSize;
}
else{
if(applet && (applet.Layout.minimumHeight > root.iconSize) && root.isVertical && (!canBeHovered)){
if(applet && (applet.Layout.minimumHeight > root.iconSize) && root.isVertical && !canBeHovered && !container.fakeIconItem){
// return applet.Layout.minimumHeight;
layoutHeight = applet.Layout.minimumHeight;
} //it is used for plasmoids that need to scale only one axis... e.g. the Weather Plasmoid
@ -566,7 +589,7 @@ Item {
&& ( (applet.Layout.maximumHeight < root.iconSize) || (applet.Layout.preferredHeight > root.iconSize))
&& root.isVertical
&& !disableScaleWidth
&& applet.pluginName !== "org.kde.plasma.folder") {
&& !container.fakeIconItem) {
//&& !root.editMode ){
disableScaleHeight = true;
//this way improves performance, probably because during animation the preferred sizes update a lot
@ -603,14 +626,14 @@ Item {
layoutWidth = root.statesLineSize + root.iconSize;
}
else{
if(applet && (applet.Layout.minimumWidth > root.iconSize) && root.isHorizontal && (!canBeHovered)){
if(applet && (applet.Layout.minimumWidth > root.iconSize) && root.isHorizontal && !canBeHovered && !container.fakeIconItem){
layoutWidth = applet.Layout.minimumWidth;
} //it is used for plasmoids that need to scale only one axis... e.g. the Weather Plasmoid
else if(applet
&& ( (applet.Layout.maximumWidth < root.iconSize) || (applet.Layout.preferredWidth > root.iconSize))
&& root.isHorizontal
&& !disableScaleHeight
&& applet.pluginName !== "org.kde.plasma.folder"){
&& !container.fakeIconItem){
// && !root.editMode){
disableScaleWidth = true;
//this way improves performance, probably because during animation the preferred sizes update a lot
@ -713,16 +736,23 @@ Item {
]
//END states
Item{
id: fakeIconItemContainer
anchors.centerIn: parent
//we setup as maximum for hidden container of some applets that break
//the Latte experience the size:96 . This is why after that size
//the folder widget changes to fullRepresentation instead of compact one
width: Math.min(96, parent.width);
height: Math.min(96, parent.height);
}
Loader{
anchors.fill: parent
active: appletIconItem && appletIconItem.source
active: container.fakeIconItem
sourceComponent: Latte.IconItem{
id: fakeAppletIconItem
source: appletIconItem.source
Component.onCompleted: {
appletIconItem.opacity = 0;
}
}
}
}
@ -794,7 +824,7 @@ Item {
anchors.fill: parent
color: "#ff080808"
samples: 2 * radius
source: appletIconItem && appletIconItem.source ? wrapperContainer :container.applet
source: container.fakeIconItem ? wrapperContainer : container.applet
radius: shadowSize
verticalOffset: 2