Merge branch 'Plasma/5.17'
This commit is contained in:
commit
66f2e2b158
1 changed files with 5 additions and 1 deletions
|
@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
// KDE
|
// KDE
|
||||||
#include <KConfigGroup>
|
#include <KConfigGroup>
|
||||||
|
#include <KIconLoader>
|
||||||
#include <KSharedConfig>
|
#include <KSharedConfig>
|
||||||
#include <KStartupInfo>
|
#include <KStartupInfo>
|
||||||
#include <KSelectionOwner>
|
#include <KSelectionOwner>
|
||||||
|
@ -284,7 +285,10 @@ void StartupFeedbackEffect::start(const QString& icon)
|
||||||
return cursorSize;
|
return cursorSize;
|
||||||
};
|
};
|
||||||
m_cursorSize = readCursorSize();
|
m_cursorSize = readCursorSize();
|
||||||
const int iconSize = m_cursorSize / 1.5;
|
int iconSize = m_cursorSize / 1.5;
|
||||||
|
if (!iconSize) {
|
||||||
|
iconSize = IconSize(KIconLoader::Small);
|
||||||
|
}
|
||||||
// get ratio for bouncing cursor so we don't need to manually calculate the sizes for each icon size
|
// get ratio for bouncing cursor so we don't need to manually calculate the sizes for each icon size
|
||||||
if (m_type == BouncingFeedback)
|
if (m_type == BouncingFeedback)
|
||||||
m_bounceSizesRatio = iconSize / 16.0;
|
m_bounceSizesRatio = iconSize / 16.0;
|
||||||
|
|
Loading…
Reference in a new issue