kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-25 19:21:41 +03:00
Code Issues Projects Releases Wiki Activity

make AutoItemSizer an Ability called AutoSize

Browse Source
This commit is contained in:
Michail Vourlakos 2020-04-20 11:41:35 +03:00
parent 505f63b3ad
commit 214447b12f
7 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
containment/package/contents/ui/DebugWindow.qml
View File

@ -437,7 +437,7 @@ Window{
Text{
text: {
if (automaticItemSizer.isActive)
if (autosize.isActive)
return "Yes";
else
return "No";
@ -449,7 +449,7 @@ Window{
}
Text{
text: automaticItemSizer.automaticIconSizeBasedSize
text: autosize.iconSize
}
Text{

10
containment/package/contents/ui/VisibilityManager.qml
View File

@ -128,7 +128,7 @@ Item{
value: root.behaveAsPlasmaPanel && !root.editMode ? thicknessAsPanel : thicknessZoomOriginal
}
property bool validIconSize: (container.iconSize===container.maxIconSize || container.iconSize === automaticItemSizer.automaticIconSizeBasedSize)
property bool validIconSize: (container.iconSize===container.maxIconSize || container.iconSize === autosize.iconSize)
property bool inPublishingState: validIconSize && !inSlidingIn && !inSlidingOut && !inTempHiding && !inForceHiding
Binding{
@ -375,7 +375,7 @@ Item{
onNormalStateChanged: {
if (normalState) {
automaticItemSizer.updateAutomaticIconSize();
autosize.updateIconSize();
root.updateSizeForAppletsInFill();
}
}
@ -735,7 +735,7 @@ Item{
}
}
var validIconSize = (container.iconSize===container.maxIconSize || container.iconSize === automaticItemSizer.automaticIconSizeBasedSize);
var validIconSize = (container.iconSize===container.maxIconSize || container.iconSize === autosize.iconSize);
//console.log("reached updating geometry ::: "+dock.maskArea);
@ -925,11 +925,11 @@ Item{
if (manager.inTempHiding) {
manager.inTempHiding = false;
automaticItemSizer.updateAutomaticIconSize();
autosize.updateIconSize();
}
manager.inTempHiding = false;
automaticItemSizer.updateAutomaticIconSize();
autosize.updateIconSize();
if (manager.debugMagager) {
console.log("showing animation ended...");

63
containment/package/contents/ui/AutomaticItemSizer.qml → containment/package/contents/ui/abilities/AutoSizePrivate.qml
View File

@ -24,27 +24,33 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.latte 0.2 as Latte
Item {
Ability {
id: sizer
// when there are only plasma style task managers OR any applets that fill width or height
// the automatic icon size algorithm should better be disabled
readonly property bool isActive: !root.containsOnlyPlasmaTasks
&& layoutsContainer.fillApplets<=0
&& layouts.fillApplets<=0
&& latteView && latteView.visibility.mode !== Latte.Types.SideBar
property int iconSize: -1 //it is not set, this is the default
property bool automaticSizeAnimation: false
readonly property int automaticStep: 8
readonly property int historyMaxSize: 10
readonly property int historyMinSize: 4
property int automaticIconSizeBasedSize: -1 //it is not set, this is the default
//! Prediction History of the algorithm in order to track cases where the algorithm produces
//! grows and shrinks endlessly
property variant history: []
onAutomaticIconSizeBasedSizeChanged: {
//! required elements
property Item container
property Item layouts
property Item visibility
onIconSizeChanged: {
if (!automaticSizeAnimation) {
automaticSizeAnimation = true;
root.slotAnimationsNeedBothAxis(1);
@ -56,11 +62,11 @@ Item {
Connections {
target: root
onContainsOnlyPlasmaTasksChanged: sizer.updateAutomaticIconSize();
onEditModeChanged: sizer.updateAutomaticIconSize();
onContainsOnlyPlasmaTasksChanged: sizer.updateIconSize();
onEditModeChanged: sizer.updateIconSize();
onMaxLengthChanged: {
if (root.editMode) {
sizer.updateAutomaticIconSize();
sizer.updateIconSize();
}
}
}
@ -70,12 +76,12 @@ Item {
onProportionIconSizeChanged: {
if (container.proportionIconSize!==-1) {
sizer.updateAutomaticIconSize();
sizer.updateIconSize();
}
}
onIconSizeChanged: {
if (((container.iconSize === sizer.automaticIconSizeBasedSize) || (container.iconSize === container.maxIconSize)) && sizer.automaticSizeAnimation){
if (((container.iconSize === sizer.iconSize) || (container.iconSize === container.maxIconSize)) && sizer.automaticSizeAnimation){
root.slotAnimationsNeedBothAxis(-1);
sizer.automaticSizeAnimation=false;
}
@ -86,13 +92,13 @@ Item {
target: latteView
onWidthChanged:{
if (root.isHorizontal && container.proportionIconSize!==-1) {
sizer.updateAutomaticIconSize();
sizer.updateIconSize();
}
}
onHeightChanged:{
if (root.isVertical && container.proportionIconSize!==-1) {
sizer.updateAutomaticIconSize();
sizer.updateIconSize();
}
}
}
@ -135,11 +141,12 @@ Item {
}
function updateAutomaticIconSize() {
if ( !doubleCallAutomaticUpdateIconSize.running && !visibilityManager.inTempHiding
&& ((visibilityManager.normalState || root.editMode)
&& (sizer.isActive || (!sizer.isActive && container.iconSize!==root.maxIconSize)))
&& (container.iconSize===container.maxIconSize || container.iconSize === sizer.automaticIconSizeBasedSize) ) {
function updateIconSize() {
if ( !doubleCallAutomaticUpdateIconSize.running && !visibility.inTempHiding
&& ((visibility.normalState || root.editMode)
&& (sizer.isActive || (!sizer.isActive && container.iconSize!==container.maxIconSize)))
&& (container.iconSize===container.maxIconSize || container.iconSize === sizer.iconSize) ) {
//!doubler timer
if (!doubleCallAutomaticUpdateIconSize.secondTimeCallApplied) {
@ -156,10 +163,10 @@ Item {
if (root.isVertical) {
layoutLength = (plasmoid.configuration.alignment === Latte.Types.Justify) ?
layoutsContainer.startLayout.height+layoutsContainer.mainLayout.height+layoutsContainer.endLayout.height : layoutsContainer.mainLayout.height
layouts.startLayout.height+layouts.mainLayout.height+layouts.endLayout.height : layouts.mainLayout.height
} else {
layoutLength = (plasmoid.configuration.alignment === Latte.Types.Justify) ?
layoutsContainer.startLayout.width+layoutsContainer.mainLayout.width+layoutsContainer.endLayout.width : layoutsContainer.mainLayout.width
layouts.startLayout.width+layouts.mainLayout.width+layouts.endLayout.width : layouts.mainLayout.width
}
var itemLength = container.iconSize + lengthMargins;
@ -187,20 +194,20 @@ Item {
var intLength = Math.round(layoutLength);
var intNextLength = Math.round(nextLength);
automaticIconSizeBasedSize = nextIconSize;
iconSize = nextIconSize;
newIconSizeFound = true;
addPrediction(intLength, intNextLength);
// console.log("Step 3 - found:"+automaticIconSizeBasedSize);
// console.log("Step 3 - found:"+iconSize);
} else if ((layoutLength<toGrowLimit
&& (container.iconSize === automaticIconSizeBasedSize)) ) { //must grow probably
&& (container.iconSize === iconSize)) ) { //must grow probably
// console.log("step4");
var nextIconSize2 = automaticIconSizeBasedSize;
var nextIconSize2 = iconSize;
var foundGoodSize = -1;
do {
nextIconSize2 = nextIconSize2 + automaticStep;
var factor2 = nextIconSize2 / automaticIconSizeBasedSize;
var factor2 = nextIconSize2 / iconSize;
var nextLength2 = factor2 * layoutLength;
if (nextLength2 < toGrowLimit) {
@ -213,14 +220,14 @@ Item {
if (foundGoodSize > 0 && !producesEndlessLoop(intLength2, intNextLength2)) {
if (foundGoodSize === container.maxIconSize) {
automaticIconSizeBasedSize = -1;
iconSize = -1;
} else {
automaticIconSizeBasedSize = foundGoodSize;
iconSize = foundGoodSize;
}
newIconSizeFound = true
addPrediction(intLength2, intNextLength2);
// console.log("Step 4 - found:"+automaticIconSizeBasedSize);
// console.log("Step 4 - found:"+iconSize);
} else {
// console.log("Step 4 - did not found...");
}
@ -228,7 +235,7 @@ Item {
}
}
//! This functions makes sure to call the updateAutomaticIconSize(); function which is costly
//! This functions makes sure to call the updateIconSize(); function which is costly
//! one more time after its last call to confirm the applied icon size found
Timer{
id:doubleCallAutomaticUpdateIconSize
@ -238,7 +245,7 @@ Item {
onTriggered: {
if (!secondTimeCallApplied) {
secondTimeCallApplied = true;
sizer.updateAutomaticIconSize();
sizer.updateIconSize();
}
}
}

8
containment/package/contents/ui/abilities/ContainerPrivate.qml
View File

@ -21,8 +21,8 @@ import QtQuick 2.7
import org.kde.plasma.plasmoid 2.0
Ability {
property int iconSize: autoItemSizerAb.automaticIconSizeBasedSize > 0 && autoItemSizerAb.isActive ?
Math.min(autoItemSizerAb.automaticIconSizeBasedSize, maxIconSize) :
property int iconSize: autosizeEnabled && autosize.iconSize > 0 ?
Math.min(autosize.iconSize, maxIconSize) :
maxIconSize
//what is the highest icon size based on what icon size is used, screen calculated or user specified
@ -35,6 +35,10 @@ Ability {
return Math.max(16,Math.round(latteView.screenGeometry.height * plasmoid.configuration.proportionIconSize/100/8)*8);
}
readonly property bool autosizeEnabled: autosize !== undefined && autosize.isActive
property Item autosize
//! Behaviors
Behavior on iconSize {
enabled: !(root.editMode && root.behaveAsPlasmaPanel)

2
containment/package/contents/ui/editmode/Visual.qml
View File

@ -396,7 +396,7 @@ Item{
editVisual.editAnimationEnded = true;
editVisual.editAnimationInFullThickness = true;
updateEffectsArea();
automaticItemSizer.updateAutomaticIconSize();
autosize.updateIconSize();
visibilityManager.updateMaskArea();
editVisual.editAnimationRunning = false;
}

4
containment/package/contents/ui/layouts/LayoutsContainer.qml
View File

@ -141,7 +141,7 @@ Item{
}
if (latteView && ((contentsWidth >= root.maxLength) || firstHalfExited || secondHalfExited)) {
automaticItemSizer.updateAutomaticIconSize();
autosize.updateIconSize();
}
if (!animationSent) {
@ -166,7 +166,7 @@ Item{
}
if (latteView && ((contentsHeight >= root.maxLength) || firstHalfExited || secondHalfExited)) {
automaticItemSizer.updateAutomaticIconSize();
autosize.updateIconSize();
}
if (!animationSent) {

14
containment/package/contents/ui/main.qml
View File

@ -463,7 +463,7 @@ Item {
property Item latteAppletContainer
property Item latteApplet
readonly property Item autoItemSizerAb: automaticItemSizer
readonly property Item autosize: _autosize
readonly property Item container: _container
readonly property Item indicatorsManager: indicators
readonly property Item parabolicManager: _parabolicManager
@ -1693,10 +1693,6 @@ Item {
}
}
AutomaticItemSizer {
id: automaticItemSizer
}
VisibilityManager{ id: visibilityManager }
DragDropArea {
@ -1827,6 +1823,14 @@ Item {
Ability.Container{
id: _container
autosize: _autosize
}
Ability.AutoSizePrivate {
id: _autosize
container: _container
layouts: layoutsContainer
visibility: visibilityManager
}
///////////////END ABILITIES