← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty-updates

« back to all changes in this revision

Viewing changes to plasma/tooltipmanager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2008-12-11 18:26:08 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20081211182608-tsu6p8ncbw1gnqxt
Tags: 4:4.1.85-0ubuntu1
* New upstream release
* Patches:
  + Removed 15_kfreebsd_support.diff from patches/series (doesn't apply and
    has no use for Ubuntu)
  + Redid 20_use_dejavu_as_default_font.diff
  + Completely removed kubuntu_09_fix_application_menu.diff (applied upstream)
  + Refreshed kubuntu_54_use_xdg_menu_prefix.diff
  + Dropped plasma/widgets/toolbutton.cpp from kubuntu_qt_ftbfs.diff (applied
    upstream)
  + Global quilt refresh

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/tooltipmanager.cpp
166
166
        return;
167
167
    }
168
168
 
 
169
    d->currentWidget = 0;
169
170
    d->showTimer->stop();  // stop the timer to show the tooltip
170
171
    d->delayedHide = false;
171
 
    d->currentWidget = 0;
172
172
    d->tipWidget->hide();
173
173
}
174
174
 
255
255
    QGraphicsWidget *w = static_cast<QGraphicsWidget*>(object);
256
256
 
257
257
    if (currentWidget == w) {
 
258
        currentWidget = 0;
 
259
        showTimer->stop();  // stop the timer to show the tooltip
258
260
        tipWidget->setContent(0, ToolTipContent());
259
261
        tipWidget->hide();
260
 
        currentWidget = 0;
261
 
        showTimer->stop();  // stop the timer to show the tooltip
262
262
        delayedHide = false;
263
263
    }
264
264
 
277
277
            //One might have moused out and back in again
278
278
            delayedHide = false;
279
279
            isShown = false;
 
280
            currentWidget = 0;
280
281
            tipWidget->hide();
281
 
            currentWidget = 0;
282
282
        }
283
283
    }
284
284
}