Changeset 84201 in webkit
- Timestamp:
- Apr 18, 2011 4:06:47 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r84193 r84201 1 2011-04-18 Andreas Kling <kling@webkit.org> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [Qt][WK2] Clean up tool-tip/status-bar confusion. 6 https://bugs.webkit.org/show_bug.cgi?id=58844 7 8 Tool-tips were incorrectly hooked up to the status bar text. 9 Chrome::setStatusbarText() now correctly causes the QWKPage::statusBarMessage() signal. 10 11 New API: 12 - QWKPage::toolTipChanged(const QString& toolTip) [signal] 13 14 QGraphicsWKView will automatically listen for this and set its own toolTip(). 15 16 * UIProcess/API/qt/ClientImpl.cpp: 17 (qt_wk_setStatusText): 18 * UIProcess/API/qt/ClientImpl.h: 19 * UIProcess/API/qt/qgraphicswkview.cpp: 20 (QGraphicsWKView::QGraphicsWKView): 21 (QGraphicsWKViewPrivate::onToolTipChanged): 22 * UIProcess/API/qt/qgraphicswkview.h: 23 * UIProcess/API/qt/qwkpage.cpp: 24 (QWKPagePrivate::toolTipChanged): 25 (QWKPage::QWKPage): 26 * UIProcess/API/qt/qwkpage.h: 27 1 28 2011-04-18 Maciej Stachowiak <mjs@apple.com> 2 29 -
trunk/Source/WebKit2/UIProcess/API/qt/ClientImpl.cpp
r84064 r84201 174 174 { 175 175 } 176 177 void qt_wk_setStatusText(WKPageRef page, WKStringRef text, const void *clientInfo) 178 { 179 QString qText = WKStringCopyQString(text); 180 emit toQWKPage(clientInfo)->statusBarMessage(qText); 181 } -
trunk/Source/WebKit2/UIProcess/API/qt/ClientImpl.h
r84064 r84201 51 51 void qt_wk_takeFocus(WKPageRef page, WKFocusDirection direction, const void *clientInfo); 52 52 void qt_wk_runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo); 53 void qt_wk_setStatusText(WKPageRef page, WKStringRef text, const void *clientInfo); 53 54 54 55 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
r79832 r84201 51 51 WKPageRef pageRef() const { return page->pageRef(); } 52 52 53 void onToolTipChanged(const QString&); 53 54 void onScaleChanged(); 54 55 void commitScale(); … … 85 86 connect(d->page, SIGNAL(focusNextPrevChild(bool)), this, SLOT(focusNextPrevChildCallback(bool))); 86 87 connect(d->page, SIGNAL(showContextMenu(QSharedPointer<QMenu>)), this, SLOT(showContextMenu(QSharedPointer<QMenu>))); 88 connect(d->page, SIGNAL(toolTipChanged(QString)), this, SLOT(onToolTipChanged(QString))); 87 89 } 88 90 … … 425 427 } 426 428 429 void QGraphicsWKViewPrivate::onToolTipChanged(const QString& toolTip) 430 { 431 q->setToolTip(toolTip); 432 } 433 427 434 void QGraphicsWKViewPrivate::commitScale() 428 435 { -
trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h
r79832 r84201 91 91 92 92 private: 93 Q_PRIVATE_SLOT(d, void onScaleChanged()); 93 Q_PRIVATE_SLOT(d, void onScaleChanged()) 94 Q_PRIVATE_SLOT(d, void onToolTipChanged(const QString&)) 94 95 95 96 QGraphicsWKViewPrivate* d; -
trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
r84064 r84201 203 203 void QWKPagePrivate::toolTipChanged(const String&, const String& newTooltip) 204 204 { 205 emit q-> statusBarMessage(QString(newTooltip));205 emit q->toolTipChanged(QString(newTooltip)); 206 206 } 207 207 … … 465 465 0, /* runJavaScriptConfirm */ 466 466 0, /* runJavaScriptPrompt */ 467 0, /* setStatusText */467 qt_wk_setStatusText, 468 468 0, /* mouseDidMoveOverElement */ 469 469 0, /* missingPluginButtonClicked */ -
trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.h
r83982 r84201 123 123 public: 124 124 Q_SIGNAL void statusBarMessage(const QString&); 125 Q_SIGNAL void toolTipChanged(const QString&); 125 126 Q_SIGNAL void titleChanged(const QString&); 126 127 Q_SIGNAL void loadStarted();
Note: See TracChangeset
for help on using the changeset viewer.