Differential D10305 Diff 26525 src/declarativeimports/core/tooltip.cpp

Changeset View

Standalone View

View Options

src/declarativeimports/core/tooltip.cpp

Context not available.
40 m_location(Plasma::Types::Floating), 40​ m_location(Plasma::Types::Floating),
41 m_textFormat(Qt::AutoText), 41​ m_textFormat(Qt::AutoText),
42 m_active(true), 42​ m_active(true),
43​ m_autoShowHide(true),
43 m_interactive(false), 44​ m_interactive(false),
44 m_usingDialog(false) 45​ m_usingDialog(false)
45{ 46​{
Context not available.
157 dlg->setVisualParent(this); 158​ dlg->setVisualParent(this);
158 dlg->setMainItem(mainItem()); 159​ dlg->setMainItem(mainItem());
159 dlg->setInteractive(m_interactive); 160​ dlg->setInteractive(m_interactive);
161​ dlg->setAutoShowHide(m_autoShowHide);
162​ connect(dlg, &ToolTipDialog::containsMouseChanged, this, &ToolTip::toolTipWindowContainsMouseChangedSlot);
davidedmundsonUnsubmitted
Done

doing a connect inside show() probably isn't what you want, you'll connect multiple times.

Also that signal name has a typo

davidedmundson: doing a connect inside show() probably isn't what you want, you'll connect multiple times.
160 dlg->show(); 163​ dlg->show();
161} 164​}
162 165​
Context not available.
235 238​
236 m_active = active; 239​ m_active = active;
237 if (!active) { 240​ if (!active) {
238 tooltipDialogInstance()->dismiss(); 241​ tooltipDialogInstance()->dismiss(this);
239 } 242​ }
240 emit activeChanged(); 243​ emit activeChanged();
241} 244​}
242 245​
246​void ToolTip::setAutoShowHide(bool autoShowHide)
247​{
248​ if (m_autoShowHide == autoShowHide) {
249​ return;
250​ }
251​
252​ m_autoShowHide = autoShowHide;
253​ emit autoShowHideChanged();
254​}
255​
243void ToolTip::setInteractive(bool interactive) 256​void ToolTip::setInteractive(bool interactive)
244{ 257​{
245 if (m_interactive == interactive) { 258​ if (m_interactive == interactive) {
Context not available.
254void ToolTip::hideToolTip() 267​void ToolTip::hideToolTip()
255{ 268​{
256 m_showTimer->stop(); 269​ m_showTimer->stop();
257 tooltipDialogInstance()->dismiss(); 270​ tooltipDialogInstance()->dismiss(this);
258} 271​}
259 272​
260QVariant ToolTip::icon() const 273​QVariant ToolTip::icon() const
Context not available.
306 m_containsMouse = contains; 319​ m_containsMouse = contains;
307 emit containsMouseChanged(); 320​ emit containsMouseChanged();
308 } 321​ }
309 if (!contains) { 322​ if (!contains && m_autoShowHide) {
310 tooltipDialogInstance()->dismiss(); 323​ tooltipDialogInstance()->dismiss(this);
311 } 324​ }
312} 325​}
313 326​
327​bool ToolTip::toolTipWindowContainsMouse() const
328​{
329​ return m_toolTipWindowContainsMouse;
330​}
331​
332​void ToolTip::toolTipWindowContainsMouseChangedSlot() {
333​ m_toolTipWindowContainsMouse = tooltipDialogInstance()->containsMouse();
334​ emit toolTipWindowContainsMouseChanged();
335​}
336​
314void ToolTip::hoverEnterEvent(QHoverEvent *event) 337​void ToolTip::hoverEnterEvent(QHoverEvent *event)
315{ 338​{
316 Q_UNUSED(event) 339​ Q_UNUSED(event)
Context not available.
324 return; 347​ return;
325 } 348​ }
326 349​
327 if (tooltipDialogInstance()->isVisible()) { 350​ if(m_autoShowHide) {
328 // We signal the tooltipmanager that we're "potentially interested, 351​ if (tooltipDialogInstance()->isVisible()) {
329 // and ask to keep it open for a bit, so other items get the chance 352​ // We signal the tooltipmanager that we're "potentially interested,
330 // to update the content before the tooltip hides -- this avoids 353​ // and ask to keep it open for a bit, so other items get the chance
331 // flickering 354​ // to update the content before the tooltip hides -- this avoids
332 // It need to be considered only when other items can deal with tooltip area 355​ // flickering
333 if (m_active) { 356​ // It need to be considered only when other items can deal with tooltip area
334 tooltipDialogInstance()->keepalive(); 357​ if (m_active) {
335 //FIXME: showToolTip needs to be renamed in sync or something like that 358​ tooltipDialogInstance()->keepalive();
336 showToolTip(); 359​ //FIXME: showToolTip needs to be renamed in sync or something like that
360​ showToolTip();
361​ }
362​ } else {
363​ m_showTimer->start(m_interval);
337 } 364​ }
338 } else { ​
339 m_showTimer->start(m_interval); ​
340 } 365​ }
341} 366​}
342 367​
Context not available.