alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.8'

Browse Source
This commit is contained in:
David Faure 2012-02-07 13:13:13 +01:00
commit 588300ee2d
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
private/applethandle.cpp
View File

@ -47,6 +47,7 @@
#include "corona.h" #include "corona.h"
#include "paintutils.h" #include "paintutils.h"
#include "theme.h" #include "theme.h"
#include "tooltipmanager.h"
#include "view.h" #include "view.h"
#include "framesvg.h" #include "framesvg.h"
@ -816,12 +817,15 @@ void AppletHandle::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
Q_UNUSED(event); Q_UNUSED(event);
//kDebug() << "hover enter"; //kDebug() << "hover enter";
//if a disappear was scheduled stop the timer if (m_applet) {
if (m_leaveTimer->isActive()) { ToolTipManager::self()->hide(m_applet);
m_leaveTimer->stop();
} }
// if we're already fading out, fade back in
else if (!m_anim.data() && m_animType == FadeOut) { if (m_leaveTimer->isActive()) {
//if a disappear was scheduled stop the timer
m_leaveTimer->stop();
} else if (!m_anim.data() && m_animType == FadeOut) {
// if we're already fading out, fade back in
startFading(FadeIn, m_entryPos, true); startFading(FadeIn, m_entryPos, true);
} }
} }

2
tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
View File

@ -54,7 +54,7 @@ Name[tg]=Санҷиш
Name[th]=ทดสอบ Name[th]=ทดสอบ
Name[tr]=Deneme Name[tr]=Deneme
Name[tt]=Тикшерү Name[tt]=Тикшерү
Name[ug]=سىناق Name[ug]=سىنا
Name[uk]=Тест Name[uk]=Тест
Name[vi]=Kiểm tra Name[vi]=Kiểm tra
Name[wa]=Sayî Name[wa]=Sayî

2
theme.cpp
View File

@ -539,7 +539,7 @@ void Theme::settingsChanged()
KConfigGroup cg = d->config(); KConfigGroup cg = d->config();
d->setThemeName(cg.readEntry("name", ThemePrivate::defaultTheme), false); d->setThemeName(cg.readEntry("name", ThemePrivate::defaultTheme), false);
cg = KConfigGroup(cg.config(), "PlasmaToolTips"); cg = KConfigGroup(cg.config(), "PlasmaToolTips");
d->toolTipDelay = cg.readEntry("Delay", qreal(0.7)); d->toolTipDelay = cg.readEntry("Delay", 700);
} }
void Theme::setThemeName(const QString &themeName) void Theme::setThemeName(const QString &themeName)

2
tooltipmanager.cpp
View File

@ -159,7 +159,7 @@ void ToolTipManager::show(QGraphicsWidget *widget)
// which can be too much for less powerful CPUs to keep up with // which can be too much for less powerful CPUs to keep up with
d->showTimer->start(200); d->showTimer->start(200);
} else { } else {
d->showTimer->start(delay * 1000); d->showTimer->start(qMax(qreal(200), delay));
} }
} }

8
widgets/iconwidget.cpp
View File

@ -1372,7 +1372,9 @@ void IconWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
return; return;
} }
d->states |= IconWidgetPrivate::PressedState; if (KGlobalSettings::singleClick() || (receivers(SIGNAL(clicked()))) > 0) {
d->states |= IconWidgetPrivate::PressedState;
}
d->clickStartPos = scenePos(); d->clickStartPos = scenePos();
bool handled = false; bool handled = false;
@ -1451,10 +1453,14 @@ void IconWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)
d->states |= IconWidgetPrivate::PressedState;
emit doubleClicked(); emit doubleClicked();
if (!KGlobalSettings::singleClick()) { if (!KGlobalSettings::singleClick()) {
emit activated(); emit activated();
} }
update();
} }
void IconWidget::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void IconWidget::hoverEnterEvent(QGraphicsSceneHoverEvent *event)