kde-fix
/
archlinux-kwin-pkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '11d4feff38'
${ noResults }
archlinux-kwin-pkg/revert_mass-spring-damper_m...

229 lines
7.8 KiB
Diff
Raw Blame History

Subject: [PATCH] revert mass-spring-damper model for slide animation
---
Index: src/effects/slide/slide.kcfg
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/effects/slide/slide.kcfg b/src/effects/slide/slide.kcfg
--- a/src/effects/slide/slide.kcfg (revision 9ae6a9fc7377d72e8a320e1eca4dce7fba40205c)
+++ b/src/effects/slide/slide.kcfg (date 1699984902100)
@@ -6,11 +6,17 @@
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile arg="true"/>
<group name="Effect-slide">
+ <entry name="Duration" type="UInt">
+ <default>0</default>
+ </entry>
<entry name="HorizontalGap" type="UInt">
<default>45</default>
</entry>
<entry name="VerticalGap" type="UInt">
<default>20</default>
+ </entry>
+ <entry name="SlideDocks" type="Bool">
+ <default>false</default>
</entry>
<entry name="SlideBackground" type="Bool">
<default>true</default>
Index: src/effects/slide/slide_config.ui
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/effects/slide/slide_config.ui b/src/effects/slide/slide_config.ui
--- a/src/effects/slide/slide_config.ui (revision 9ae6a9fc7377d72e8a320e1eca4dce7fba40205c)
+++ b/src/effects/slide/slide_config.ui (date 1699984902103)
@@ -12,6 +12,39 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
+ <layout class="QFormLayout" name="layout_Duration">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_Duration">
+ <property name="text">
+ <string>Duration:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="kcfg_Duration">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="specialValueText">
+ <string extracomment="Duration of the slide animation.">Default</string>
+ </property>
+ <property name="suffix">
+ <string> milliseconds</string>
+ </property>
+ <property name="maximum">
+ <number>9999</number>
+ </property>
+ <property name="singleStep">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
<widget class="QGroupBox" name="groupBox_Gaps">
<property name="title">
<string>Gap between desktops</string>
@@ -64,6 +97,13 @@
</widget>
</item>
</layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="kcfg_SlideDocks">
+ <property name="text">
+ <string>Slide docks</string>
+ </property>
</widget>
</item>
<item>
Index: src/effects/slide/slide.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/effects/slide/slide.h b/src/effects/slide/slide.h
--- a/src/effects/slide/slide.h (revision 9ae6a9fc7377d72e8a320e1eca4dce7fba40205c)
+++ b/src/effects/slide/slide.h (date 1699993636445)
@@ -68,6 +68,7 @@
static bool supported();
+ int duration() const;
int horizontalGap() const;
int verticalGap() const;
bool slideBackground() const;
@@ -97,6 +98,7 @@
int m_hGap;
int m_vGap;
bool m_slideBackground;
+ int m_fullAnimationDuration; // Miliseconds for 1 complete desktop switch
enum class State {
Inactive,
@@ -105,6 +107,7 @@
};
State m_state = State::Inactive;
+ TimeLine m_timeLine;
SpringMotion m_motionX;
SpringMotion m_motionY;
@@ -132,6 +135,11 @@
QHash<EffectWindow *, WindowData> m_windowData;
};
+inline int SlideEffect::duration() const
+{
+ return m_fullAnimationDuration;
+}
+
inline int SlideEffect::horizontalGap() const
{
return m_hGap;
Index: src/effects/slide/slide.cpp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/effects/slide/slide.cpp b/src/effects/slide/slide.cpp
--- a/src/effects/slide/slide.cpp (revision 9ae6a9fc7377d72e8a320e1eca4dce7fba40205c)
+++ b/src/effects/slide/slide.cpp (date 1700066958682)
@@ -26,6 +26,8 @@
initConfig<SlideConfig>();
reconfigure(ReconfigureAll);
+ m_timeLine.setEasingCurve(QEasingCurve::OutCubic);
+
connect(effects, &EffectsHandler::desktopChanged,
this, &SlideEffect::desktopChanged);
connect(effects, &EffectsHandler::desktopChanging,
@@ -62,11 +64,8 @@
{
SlideConfig::self()->read();
- const qreal springConstant = 300.0 / effects->animationTimeFactor();
- const qreal dampingRatio = 1.1;
-
- m_motionX = SpringMotion(springConstant, dampingRatio);
- m_motionY = SpringMotion(springConstant, dampingRatio);
+ m_fullAnimationDuration = animationTime<SlideConfig>(500);
+ m_timeLine.setDuration(std::chrono::milliseconds(m_fullAnimationDuration));
m_hGap = SlideConfig::horizontalGap();
m_vGap = SlideConfig::verticalGap();
@@ -94,18 +93,10 @@
void SlideEffect::prePaintScreen(ScreenPrePaintData &data, std::chrono::milliseconds presentTime)
{
- std::chrono::milliseconds timeDelta = std::chrono::milliseconds::zero();
- if (m_lastPresentTime.count()) {
- timeDelta = presentTime - m_lastPresentTime;
- }
- m_lastPresentTime = presentTime;
+ m_timeLine.advance(presentTime);
if (m_state == State::ActiveAnimation) {
- m_motionX.advance(timeDelta);
- m_motionY.advance(timeDelta);
- const QSize virtualSpaceSize = effects->virtualScreenSize();
- m_currentPosition.setX(m_motionX.position() / virtualSpaceSize.width());
- m_currentPosition.setY(m_motionY.position() / virtualSpaceSize.height());
+ m_currentPosition = m_startPos + (m_endPos - m_startPos) * m_timeLine.value();
}
const QList<VirtualDesktop *> desktops = effects->desktops();
@@ -252,7 +243,7 @@
void SlideEffect::postPaintScreen()
{
- if (m_state == State::ActiveAnimation && !m_motionX.isMoving() && !m_motionY.isMoving()) {
+ if (m_state == State::ActiveAnimation && m_timeLine.done()) {
finishedSwitching();
}
@@ -295,6 +286,7 @@
m_state = State::ActiveAnimation;
m_movingWindow = movingWindow;
+ m_timeLine.reset();
m_startPos = m_currentPosition;
m_endPos = effects->desktopGridCoords(current);
@@ -302,11 +294,19 @@
optimizePath();
}
- const QSize virtualSpaceSize = effects->virtualScreenSize();
- m_motionX.setAnchor(m_endPos.x() * virtualSpaceSize.width());
- m_motionX.setPosition(m_startPos.x() * virtualSpaceSize.width());
- m_motionY.setAnchor(m_endPos.y() * virtualSpaceSize.height());
- m_motionY.setPosition(m_startPos.y() * virtualSpaceSize.height());
+ // Find an apropriate duration
+ QPointF distance = m_startPos - m_endPos;
+ distance.setX(std::abs(distance.x()));
+ distance.setY(std::abs(distance.y()));
+ if (distance.x() < 1 && distance.y() < 1) {
+ if (distance.x() > distance.y()) {
+ m_timeLine.setDuration(std::chrono::milliseconds(std::max(1, (int)(m_fullAnimationDuration * distance.x()))));
+ } else {
+ m_timeLine.setDuration(std::chrono::milliseconds(std::max(1, (int)(m_fullAnimationDuration * distance.y()))));
+ }
+ } else {
+ m_timeLine.setDuration(std::chrono::milliseconds(m_fullAnimationDuration));
+ }
effects->setActiveFullScreenEffect(this);
effects->addRepaintFull();
Reference in New Issue View Git Blame Copy Permalink