40082 2010-06-02 13:52:26 -0700 [Qt] Dropdown box is seen twice in a webpage. 2010-12-24 12:04:22 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) S60 Hardware S60 3rd edition RESOLVED WORKSFORME Qt, QtTriaged P2 Normal --- 1 ostap73 webkit-unassigned hausmann jturcotte kenneth laszlo.gombos luiz oldest_to_newest 233433 0 ostap73 2010-06-02 13:52:26 -0700 Easy to reproduce with QGraphicsWebView: load a page with a select list, open the dropdown, then switch windows and see the page again. The select combobox is drawn twice (possibly need to scroll the page to see the second one). Reproducible on ALL platforms when using the QGraphicsWebView. Drawing the dropdowns consist of two parts: drawing the combobox itself and drawing the dropdown (or popup as it’s called). When not using graphics view, Webkit renders the combobox itself via RenderTheme, and draws the popup using QComboBox::showPopup. When using QGraphicsWebView the combobox gets drawn twice because the popup is rendered via a QGraphicsProxyWidget that is wrapping a QComboBox. So, in graphics scene there is a graphics item having the QComboBox on top of the QGraphicsWebView, and the QGraphicsWebView has already drawn the combobox once. When clicking somewhere on the page, we are calling hidePopup() for the popup and proxy->setVisible(false) gets called specifically. However, when QGraphicsView loses the focus, popups are removed but the graphics item (combobox) itself is not. So, graphics view really works as expected. It’s not even supposed to remove any comboboxes added to it when the focus changes, just to close any open popups. It’s not possible to get focus events to QWebPopup so we cannot just call proxy->setVisible(false) when losing the focus. Anyway, I think the real problem is that we are overdrawing the combobox when using the proxy widget. One way to fix this would be to make sure we are not drawing twice. Just inherit from QGraphicsProxyWidget and overwrite the paint method and don’t draw anything there. 233520 1 57717 ostap73 2010-06-02 17:27:24 -0700 Created attachment 57717 Disable painting in QGraphicsWidget below combobox 233591 2 kenneth 2010-06-02 20:41:36 -0700 Making the popup close as expected should solve the problem as well. Anyway, I think you need to add part of the description of the problem from the ChangeLog, in the actual code as well. From reading the code, I do not understand why the paint method does nothing. Reading the ChangeLog on the other hand, makes that quite clear. 233592 3 57717 kenneth 2010-06-02 20:43:59 -0700 Comment on attachment 57717 Disable painting in QGraphicsWidget below combobox r- due to a required improvements to the comments for QFallbackWebPopupGraphicsProxyWidget::paint(). What 'second combo box' is, is not clear due to the lack of context. 233911 4 57809 ostap73 2010-06-03 13:54:31 -0700 Created attachment 57809 Added better comment to the empty paint() 234340 5 57809 kenneth 2010-06-04 12:43:06 -0700 Comment on attachment 57809 Added better comment to the empty paint() We are getting there! I do not like the ChangeLog entry. First of all, it doesn't start by saying what the actual problem is (neither does the bug title, which just explains the solution), but instead explain very technically what is causing it and how you are fixing in. That part is good! When you write a ChangeLog please consider: what, why, how. What is the issue at hand/what are you implementing, why are you doing this, how are you doing/fixing it. > > +class QFallbackWebPopupGraphicsProxyWidget : public QGraphicsProxyWidget { I would not prefix this with Q* as this is not part of the our API, instead I would use Qt* Actually you are implementing it inside the QtFallbackWebPopup, which has class QtFallbackWebPopupCombo : public QComboBox { So the above is actually what you are wrapping. QtFallbackWebPopupComboProxyWidget would be fine with me. > +public: > + QFallbackWebPopupGraphicsProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) : > + QGraphicsProxyWidget(parent, wFlags) {} Wrong indentation, and wrong placement of * > +/* > + Drawing the dropdowns consist of two parts: drawing the combobox itself and. > + drawing the dropdown (or popup as its called). When not using graphics view,. > + Webkit renders the combobox itself via RenderTheme, and draws the popup using. > + QComboBox::showPopup. When using QGraphicsWebView the combobox gets drawn twice. > + because the popup is rendered via a QGraphicsProxyWidget that is wrapping a QComboBox.. > + So, in graphics scene there is a graphics item having the QComboBox on top of. > + the QGraphicsWebView, and the QGraphicsWebView has already drawn the combobox once. > + > + When clicking somewhere on the page, we are calling hidePopup() for the popup and. > + proxy->setVisible(false) gets called specifically. However, when QGraphicsView loses. > + the focus, popups are removed but the graphics item (combobox) itself is not. So,. > + graphics view really works as expected. Its not even supposed to remove any comboboxes. > + added to it when the focus changes, just to close any open popups. Its not possible. > + to get focus events to QWebPopup so we cannot just call proxy->setVisible(false). > + when losing the focus. > + > + The real problem is that we are overdrawing the combobox when using the proxy widget. > + One way to fix this would be to make sure we are not drawing twice. Just inherit from. > + QGraphicsProxyWidget and overwrite the paint method and dont draw anything there. > +*/ > + void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) {} > +}; Comments inline in code usuablly uses // and not /* *** */. Please change that. > + > QtFallbackWebPopupCombo::QtFallbackWebPopupCombo(QtFallbackWebPopup& ownerPopup) > : m_ownerPopup(ownerPopup) > { > @@ -115,7 +143,7 @@ void QtFallbackWebPopup::show() > QRect rect = geometry(); > if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) { > if (!m_proxy) { > - m_proxy = new QGraphicsProxyWidget(webView); > + m_proxy = new QFallbackWebPopupGraphicsProxyWidget(webView); > m_proxy->setWidget(m_combo); > } else > m_proxy->setVisible(true); 234344 6 kenneth 2010-06-04 12:48:35 -0700 [Qt] Disable drawing in combobox proxy widget in QGraphicsWebView mode https://bugs.webkit.org/show_bug.cgi?id=40082 That is NOT the title of this bug, which currently is called 'Dropdown box is seen twice in a webpage' That is actually a confusing title, as I understand from your changelog explanation, the issue is not the popup itself, but that the combobox is being drawn as it is being drawn by the proxywidget and by the RenderTheme. 234789 7 jturcotte 2010-06-07 04:36:19 -0700 This patch cause a bug where I can't reopen the popup. On Windows I do these steps in QTestBrowser set in graphics web view mode: - Load http://www.google.com/advanced_search - Clic on a combobox to show the popup - While the popup is shown, focus on a different window (this should hide the popup) - Before clicking anywhere in the test browser, scroll it - Re-click on the same combobox I get the popup shown for less than a second then it disapear and I can't open this combobox anymore by clicking on it. 236579 8 ostap73 2010-06-10 16:22:28 -0700 (In reply to comment #7) > This patch cause a bug where I can't reopen the popup. > > On Windows I do these steps in QTestBrowser set in graphics web view mode: > - Load http://www.google.com/advanced_search > - Clic on a combobox to show the popup > - While the popup is shown, focus on a different window (this should hide the popup) > - Before clicking anywhere in the test browser, scroll it > - Re-click on the same combobox > > I get the popup shown for less than a second then it disapear and I can't open this combobox anymore by clicking on it. Actually, we managed to reproduce this even without patch. With patch it happens a more often. Should be some timing issue - otherwise I cannot imaging, how empty paint method can cause this. 238108 9 58716 ostap73 2010-06-14 15:50:33 -0700 Created attachment 58716 Patch update by comments. 238113 10 58719 ostap73 2010-06-14 15:56:43 -0700 Created attachment 58719 Updated changelog. 326547 11 58719 kenneth 2010-12-24 02:38:48 -0800 Comment on attachment 58719 Updated changelog. View in context: https://bugs.webkit.org/attachment.cgi?id=58719&action=review The comment is very very detailed and not get out of touch with the code. In WebKit we like comments to be concise and to the point. Btw, is this still an issue? Can it be fixed in Qt? > WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp:72 > + void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) {} Needs space between { and }. WebKit coding style. 326708 12 ostap73 2010-12-24 12:03:23 -0800 (In reply to comment #11) > (From update of attachment 58719 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=58719&action=review > The comment is very very detailed and not get out of touch with the code. In WebKit we like comments to be concise and to the point. > Btw, is this still an issue? Can it be fixed in Qt? Not reproducible anymore with qt 4.7.1 and webkit trunk. 57717 2010-06-02 17:27:24 -0700 2010-06-03 13:54:31 -0700 Disable painting in QGraphicsWidget below combobox BR-2541.diff text/plain 3605 ostap73 SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjA1NzQpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTAtMDYtMDIgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAg PG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBEaXNhYmxlIGRyYXdpbmcgaW4gY29tYm9i b3ggcHJveHkgd2lkZ2V0IGluIFFHcmFwaGljc1dlYlZpZXcgbW9kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAwODIKKyAgICAgICAgCisgICAgICAg IERyYXdpbmcgdGhlIGRyb3Bkb3ducyBjb25zaXN0IG9mIHR3byBwYXJ0czogZHJhd2luZyB0aGUg Y29tYm9ib3ggaXRzZWxmIGFuZCAKKyAgICAgICAgZHJhd2luZyB0aGUgZHJvcGRvd24gKG9yIHBv cHVwIGFzIGl0cyBjYWxsZWQpLiBXaGVuIG5vdCB1c2luZyBncmFwaGljcyB2aWV3LCAKKyAgICAg ICAgV2Via2l0IHJlbmRlcnMgdGhlIGNvbWJvYm94IGl0c2VsZiB2aWEgUmVuZGVyVGhlbWUsIGFu ZCBkcmF3cyB0aGUgcG9wdXAgdXNpbmcgCisgICAgICAgIFFDb21ib0JveDo6c2hvd1BvcHVwLiBX aGVuIHVzaW5nIFFHcmFwaGljc1dlYlZpZXcgdGhlIGNvbWJvYm94IGdldHMgZHJhd24gdHdpY2Ug CisgICAgICAgIGJlY2F1c2UgdGhlIHBvcHVwIGlzIHJlbmRlcmVkIHZpYSBhIFFHcmFwaGljc1By b3h5V2lkZ2V0IHRoYXQgaXMgd3JhcHBpbmcgYSBRQ29tYm9Cb3guIAorICAgICAgICBTbywgaW4g Z3JhcGhpY3Mgc2NlbmUgdGhlcmUgaXMgYSBncmFwaGljcyBpdGVtIGhhdmluZyB0aGUgUUNvbWJv Qm94IG9uIHRvcCBvZiAKKyAgICAgICAgdGhlIFFHcmFwaGljc1dlYlZpZXcsIGFuZCB0aGUgUUdy YXBoaWNzV2ViVmlldyBoYXMgYWxyZWFkeSBkcmF3biB0aGUgY29tYm9ib3ggb25jZS4KKyAgICAg ICAgCisgICAgICAgIFdoZW4gY2xpY2tpbmcgc29tZXdoZXJlIG9uIHRoZSBwYWdlLCB3ZSBhcmUg Y2FsbGluZyBoaWRlUG9wdXAoKSBmb3IgdGhlIHBvcHVwIGFuZCAKKyAgICAgICAgcHJveHktPnNl dFZpc2libGUoZmFsc2UpIGdldHMgY2FsbGVkIHNwZWNpZmljYWxseS4gSG93ZXZlciwgd2hlbiBR R3JhcGhpY3NWaWV3IGxvc2VzIAorICAgICAgICB0aGUgZm9jdXMsIHBvcHVwcyBhcmUgcmVtb3Zl ZCBidXQgdGhlIGdyYXBoaWNzIGl0ZW0gKGNvbWJvYm94KSBpdHNlbGYgaXMgbm90LiBTbywgCisg ICAgICAgIGdyYXBoaWNzIHZpZXcgcmVhbGx5IHdvcmtzIGFzIGV4cGVjdGVkLiBJdHMgbm90IGV2 ZW4gc3VwcG9zZWQgdG8gcmVtb3ZlIGFueSBjb21ib2JveGVzIAorICAgICAgICBhZGRlZCB0byBp dCB3aGVuIHRoZSBmb2N1cyBjaGFuZ2VzLCBqdXN0IHRvIGNsb3NlIGFueSBvcGVuIHBvcHVwcy4g SXRzIG5vdCBwb3NzaWJsZSAKKyAgICAgICAgdG8gZ2V0IGZvY3VzIGV2ZW50cyB0byBRV2ViUG9w dXAgc28gd2UgY2Fubm90IGp1c3QgY2FsbCBwcm94eS0+c2V0VmlzaWJsZShmYWxzZSkgCisgICAg ICAgIHdoZW4gbG9zaW5nIHRoZSBmb2N1cy4KKyAgICAgICAgCisgICAgICAgIFRoZSByZWFsIHBy b2JsZW0gaXMgdGhhdCB3ZSBhcmUgb3ZlcmRyYXdpbmcgdGhlIGNvbWJvYm94IHdoZW4gdXNpbmcg dGhlIHByb3h5IHdpZGdldC4gCisgICAgICAgIE9uZSB3YXkgdG8gZml4IHRoaXMgd291bGQgYmUg dG8gbWFrZSBzdXJlIHdlIGFyZSBub3QgZHJhd2luZyB0d2ljZS4gSnVzdCBpbmhlcml0IGZyb20g CisgICAgICAgIFFHcmFwaGljc1Byb3h5V2lkZ2V0IGFuZCBvdmVyd3JpdGUgdGhlIHBhaW50IG1l dGhvZCBhbmQgZG9udCBkcmF3IGFueXRoaW5nIHRoZXJlLgorICAgICAgICAKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UUZhbGxiYWNrV2ViUG9wdXBHcmFwaGljc1Byb3h5V2lkZ2V0OjpRRmFsbGJhY2tXZWJQb3B1cEdy YXBoaWNzUHJveHlXaWRnZXQpOgorICAgICAgICAoV2ViQ29yZTo6UUZhbGxiYWNrV2ViUG9wdXBH cmFwaGljc1Byb3h5V2lkZ2V0OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpRdEZhbGxiYWNr V2ViUG9wdXA6OnNob3cpOgorCiAyMDEwLTA2LTAxICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9u QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlh bnNlbi4KSW5kZXg6IFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2Vi UG9wdXAuY3BwCShyZXZpc2lvbiA2MDU2NikKKysrIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9R dEZhbGxiYWNrV2ViUG9wdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCwxNCBAQAog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIFFGYWxsYmFja1dlYlBvcHVwR3JhcGhpY3NQ cm94eVdpZGdldCA6IHB1YmxpYyBRR3JhcGhpY3NQcm94eVdpZGdldCB7CitwdWJsaWM6CisgICAg UUZhbGxiYWNrV2ViUG9wdXBHcmFwaGljc1Byb3h5V2lkZ2V0KFFHcmFwaGljc0l0ZW0gKnBhcmVu dCA9IDAsIFF0OjpXaW5kb3dGbGFncyB3RmxhZ3MgPSAwKSA6IAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgUUdyYXBoaWNzUHJveHlXaWRnZXQocGFyZW50LCB3RmxhZ3MpIHt9 CisgICAgLy8gZGlzcGxheSBub3RoaW5nLCBzbyB3ZSBjYW4ndCBzZWUgdGhlIHNlY29uZCBjb21i byBib3gKKyAgICB2b2lkIHBhaW50KFFQYWludGVyKiwgY29uc3QgUVN0eWxlT3B0aW9uR3JhcGhp Y3NJdGVtKiwgUVdpZGdldCopIHt9Cit9OworCiBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibzo6UXRG YWxsYmFja1dlYlBvcHVwQ29tYm8oUXRGYWxsYmFja1dlYlBvcHVwJiBvd25lclBvcHVwKQogICAg IDogbV9vd25lclBvcHVwKG93bmVyUG9wdXApCiB7CkBAIC0xMTUsNyArMTIzLDcgQEAgdm9pZCBR dEZhbGxiYWNrV2ViUG9wdXA6OnNob3coKQogICAgIFFSZWN0IHJlY3QgPSBnZW9tZXRyeSgpOwog ICAgIGlmIChRR3JhcGhpY3NXZWJWaWV3ICp3ZWJWaWV3ID0gcW9iamVjdF9jYXN0PFFHcmFwaGlj c1dlYlZpZXcqPihwYWdlQ2xpZW50KCktPnBsdWdpblBhcmVudCgpKSkgewogICAgICAgICBpZiAo IW1fcHJveHkpIHsKLSAgICAgICAgICAgIG1fcHJveHkgPSBuZXcgUUdyYXBoaWNzUHJveHlXaWRn ZXQod2ViVmlldyk7CisgICAgICAgICAgICBtX3Byb3h5ID0gbmV3IFFGYWxsYmFja1dlYlBvcHVw R3JhcGhpY3NQcm94eVdpZGdldCh3ZWJWaWV3KTsKICAgICAgICAgICAgIG1fcHJveHktPnNldFdp ZGdldChtX2NvbWJvKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBtX3Byb3h5LT5zZXRW aXNpYmxlKHRydWUpOwo= 57809 2010-06-03 13:54:31 -0700 2010-06-14 15:50:33 -0700 Added better comment to the empty paint() BR-2541_1.diff text/plain 5106 ostap73 SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjA2MzApCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTAtMDYtMDMgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAg PG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBEaXNhYmxlIGRyYXdpbmcgaW4gY29tYm9i b3ggcHJveHkgd2lkZ2V0IGluIFFHcmFwaGljc1dlYlZpZXcgbW9kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAwODIKKyAgICAgICAgCisgICAgICAg IERyYXdpbmcgdGhlIGRyb3Bkb3ducyBjb25zaXN0IG9mIHR3byBwYXJ0czogZHJhd2luZyB0aGUg Y29tYm9ib3ggaXRzZWxmIGFuZCAKKyAgICAgICAgZHJhd2luZyB0aGUgZHJvcGRvd24gKG9yIHBv cHVwIGFzIGl0cyBjYWxsZWQpLiBXaGVuIG5vdCB1c2luZyBncmFwaGljcyB2aWV3LCAKKyAgICAg ICAgV2Via2l0IHJlbmRlcnMgdGhlIGNvbWJvYm94IGl0c2VsZiB2aWEgUmVuZGVyVGhlbWUsIGFu ZCBkcmF3cyB0aGUgcG9wdXAgdXNpbmcgCisgICAgICAgIFFDb21ib0JveDo6c2hvd1BvcHVwLiBX aGVuIHVzaW5nIFFHcmFwaGljc1dlYlZpZXcgdGhlIGNvbWJvYm94IGdldHMgZHJhd24gdHdpY2Ug CisgICAgICAgIGJlY2F1c2UgdGhlIHBvcHVwIGlzIHJlbmRlcmVkIHZpYSBhIFFHcmFwaGljc1By b3h5V2lkZ2V0IHRoYXQgaXMgd3JhcHBpbmcgYSBRQ29tYm9Cb3guIAorICAgICAgICBTbywgaW4g Z3JhcGhpY3Mgc2NlbmUgdGhlcmUgaXMgYSBncmFwaGljcyBpdGVtIGhhdmluZyB0aGUgUUNvbWJv Qm94IG9uIHRvcCBvZiAKKyAgICAgICAgdGhlIFFHcmFwaGljc1dlYlZpZXcsIGFuZCB0aGUgUUdy YXBoaWNzV2ViVmlldyBoYXMgYWxyZWFkeSBkcmF3biB0aGUgY29tYm9ib3ggb25jZS4KKyAgICAg ICAgCisgICAgICAgIFdoZW4gY2xpY2tpbmcgc29tZXdoZXJlIG9uIHRoZSBwYWdlLCB3ZSBhcmUg Y2FsbGluZyBoaWRlUG9wdXAoKSBmb3IgdGhlIHBvcHVwIGFuZCAKKyAgICAgICAgcHJveHktPnNl dFZpc2libGUoZmFsc2UpIGdldHMgY2FsbGVkIHNwZWNpZmljYWxseS4gSG93ZXZlciwgd2hlbiBR R3JhcGhpY3NWaWV3IGxvc2VzIAorICAgICAgICB0aGUgZm9jdXMsIHBvcHVwcyBhcmUgcmVtb3Zl ZCBidXQgdGhlIGdyYXBoaWNzIGl0ZW0gKGNvbWJvYm94KSBpdHNlbGYgaXMgbm90LiBTbywgCisg ICAgICAgIGdyYXBoaWNzIHZpZXcgcmVhbGx5IHdvcmtzIGFzIGV4cGVjdGVkLiBJdHMgbm90IGV2 ZW4gc3VwcG9zZWQgdG8gcmVtb3ZlIGFueSBjb21ib2JveGVzIAorICAgICAgICBhZGRlZCB0byBp dCB3aGVuIHRoZSBmb2N1cyBjaGFuZ2VzLCBqdXN0IHRvIGNsb3NlIGFueSBvcGVuIHBvcHVwcy4g SXRzIG5vdCBwb3NzaWJsZSAKKyAgICAgICAgdG8gZ2V0IGZvY3VzIGV2ZW50cyB0byBRV2ViUG9w dXAgc28gd2UgY2Fubm90IGp1c3QgY2FsbCBwcm94eS0+c2V0VmlzaWJsZShmYWxzZSkgCisgICAg ICAgIHdoZW4gbG9zaW5nIHRoZSBmb2N1cy4KKyAgICAgICAgCisgICAgICAgIFRoZSByZWFsIHBy b2JsZW0gaXMgdGhhdCB3ZSBhcmUgb3ZlcmRyYXdpbmcgdGhlIGNvbWJvYm94IHdoZW4gdXNpbmcg dGhlIHByb3h5IHdpZGdldC4gCisgICAgICAgIE9uZSB3YXkgdG8gZml4IHRoaXMgd291bGQgYmUg dG8gbWFrZSBzdXJlIHdlIGFyZSBub3QgZHJhd2luZyB0d2ljZS4gSnVzdCBpbmhlcml0IGZyb20g CisgICAgICAgIFFHcmFwaGljc1Byb3h5V2lkZ2V0IGFuZCBvdmVyd3JpdGUgdGhlIHBhaW50IG1l dGhvZCBhbmQgZG9udCBkcmF3IGFueXRoaW5nIHRoZXJlLgorICAgICAgICAKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UUZhbGxiYWNrV2ViUG9wdXBHcmFwaGljc1Byb3h5V2lkZ2V0OjpRRmFsbGJhY2tXZWJQb3B1cEdy YXBoaWNzUHJveHlXaWRnZXQpOgorICAgICAgICAoV2ViQ29yZTo6UUZhbGxiYWNrV2ViUG9wdXBH cmFwaGljc1Byb3h5V2lkZ2V0OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpRdEZhbGxiYWNr V2ViUG9wdXA6OnNob3cpOgorCiAyMDEwLTA2LTAzICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9u QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBMYXN6bG8gR29tYm9zLgpJbmRleDog V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHJl dmlzaW9uIDYwNTY2KQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQ b3B1cC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDM0IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAorY2xhc3MgUUZhbGxiYWNrV2ViUG9wdXBHcmFwaGljc1Byb3h5V2lkZ2V0IDog cHVibGljIFFHcmFwaGljc1Byb3h5V2lkZ2V0IHsKK3B1YmxpYzoKKyAgICBRRmFsbGJhY2tXZWJQ b3B1cEdyYXBoaWNzUHJveHlXaWRnZXQoUUdyYXBoaWNzSXRlbSAqcGFyZW50ID0gMCwgUXQ6Oldp bmRvd0ZsYWdzIHdGbGFncyA9IDApIDogCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBRR3JhcGhpY3NQcm94eVdpZGdldChwYXJlbnQsIHdGbGFncykge30KKy8qCisgICAgRHJh d2luZyB0aGUgZHJvcGRvd25zIGNvbnNpc3Qgb2YgdHdvIHBhcnRzOiBkcmF3aW5nIHRoZSBjb21i b2JveCBpdHNlbGYgYW5kLgorICAgIGRyYXdpbmcgdGhlIGRyb3Bkb3duIChvciBwb3B1cCBhcyBp dHMgY2FsbGVkKS4gV2hlbiBub3QgdXNpbmcgZ3JhcGhpY3MgdmlldywuCisgICAgV2Via2l0IHJl bmRlcnMgdGhlIGNvbWJvYm94IGl0c2VsZiB2aWEgUmVuZGVyVGhlbWUsIGFuZCBkcmF3cyB0aGUg cG9wdXAgdXNpbmcuCisgICAgUUNvbWJvQm94OjpzaG93UG9wdXAuIFdoZW4gdXNpbmcgUUdyYXBo aWNzV2ViVmlldyB0aGUgY29tYm9ib3ggZ2V0cyBkcmF3biB0d2ljZS4KKyAgICBiZWNhdXNlIHRo ZSBwb3B1cCBpcyByZW5kZXJlZCB2aWEgYSBRR3JhcGhpY3NQcm94eVdpZGdldCB0aGF0IGlzIHdy YXBwaW5nIGEgUUNvbWJvQm94Li4KKyAgICBTbywgaW4gZ3JhcGhpY3Mgc2NlbmUgdGhlcmUgaXMg YSBncmFwaGljcyBpdGVtIGhhdmluZyB0aGUgUUNvbWJvQm94IG9uIHRvcCBvZi4KKyAgICB0aGUg UUdyYXBoaWNzV2ViVmlldywgYW5kIHRoZSBRR3JhcGhpY3NXZWJWaWV3IGhhcyBhbHJlYWR5IGRy YXduIHRoZSBjb21ib2JveCBvbmNlLgorCisgICAgV2hlbiBjbGlja2luZyBzb21ld2hlcmUgb24g dGhlIHBhZ2UsIHdlIGFyZSBjYWxsaW5nIGhpZGVQb3B1cCgpIGZvciB0aGUgcG9wdXAgYW5kLgor ICAgIHByb3h5LT5zZXRWaXNpYmxlKGZhbHNlKSBnZXRzIGNhbGxlZCBzcGVjaWZpY2FsbHkuIEhv d2V2ZXIsIHdoZW4gUUdyYXBoaWNzVmlldyBsb3Nlcy4KKyAgICB0aGUgZm9jdXMsIHBvcHVwcyBh cmUgcmVtb3ZlZCBidXQgdGhlIGdyYXBoaWNzIGl0ZW0gKGNvbWJvYm94KSBpdHNlbGYgaXMgbm90 LiBTbywuCisgICAgZ3JhcGhpY3MgdmlldyByZWFsbHkgd29ya3MgYXMgZXhwZWN0ZWQuIEl0cyBu b3QgZXZlbiBzdXBwb3NlZCB0byByZW1vdmUgYW55IGNvbWJvYm94ZXMuCisgICAgYWRkZWQgdG8g aXQgd2hlbiB0aGUgZm9jdXMgY2hhbmdlcywganVzdCB0byBjbG9zZSBhbnkgb3BlbiBwb3B1cHMu IEl0cyBub3QgcG9zc2libGUuCisgICAgdG8gZ2V0IGZvY3VzIGV2ZW50cyB0byBRV2ViUG9wdXAg c28gd2UgY2Fubm90IGp1c3QgY2FsbCBwcm94eS0+c2V0VmlzaWJsZShmYWxzZSkuCisgICAgd2hl biBsb3NpbmcgdGhlIGZvY3VzLgorCisgICAgVGhlIHJlYWwgcHJvYmxlbSBpcyB0aGF0IHdlIGFy ZSBvdmVyZHJhd2luZyB0aGUgY29tYm9ib3ggd2hlbiB1c2luZyB0aGUgcHJveHkgd2lkZ2V0Lgor ICAgIE9uZSB3YXkgdG8gZml4IHRoaXMgd291bGQgYmUgdG8gbWFrZSBzdXJlIHdlIGFyZSBub3Qg ZHJhd2luZyB0d2ljZS4gSnVzdCBpbmhlcml0IGZyb20uCisgICAgUUdyYXBoaWNzUHJveHlXaWRn ZXQgYW5kIG92ZXJ3cml0ZSB0aGUgcGFpbnQgbWV0aG9kIGFuZCBkb250IGRyYXcgYW55dGhpbmcg dGhlcmUuCisqLyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgCisgICAgdm9pZCBwYWludChRUGFpbnRlciosIGNvbnN0 IFFTdHlsZU9wdGlvbkdyYXBoaWNzSXRlbSosIFFXaWRnZXQqKSB7fQorfTsKKwogUXRGYWxsYmFj a1dlYlBvcHVwQ29tYm86OlF0RmFsbGJhY2tXZWJQb3B1cENvbWJvKFF0RmFsbGJhY2tXZWJQb3B1 cCYgb3duZXJQb3B1cCkKICAgICA6IG1fb3duZXJQb3B1cChvd25lclBvcHVwKQogewpAQCAtMTE1 LDcgKzE0Myw3IEBAIHZvaWQgUXRGYWxsYmFja1dlYlBvcHVwOjpzaG93KCkKICAgICBRUmVjdCBy ZWN0ID0gZ2VvbWV0cnkoKTsKICAgICBpZiAoUUdyYXBoaWNzV2ViVmlldyAqd2ViVmlldyA9IHFv YmplY3RfY2FzdDxRR3JhcGhpY3NXZWJWaWV3Kj4ocGFnZUNsaWVudCgpLT5wbHVnaW5QYXJlbnQo KSkpIHsKICAgICAgICAgaWYgKCFtX3Byb3h5KSB7Ci0gICAgICAgICAgICBtX3Byb3h5ID0gbmV3 IFFHcmFwaGljc1Byb3h5V2lkZ2V0KHdlYlZpZXcpOworICAgICAgICAgICAgbV9wcm94eSA9IG5l dyBRRmFsbGJhY2tXZWJQb3B1cEdyYXBoaWNzUHJveHlXaWRnZXQod2ViVmlldyk7CiAgICAgICAg ICAgICBtX3Byb3h5LT5zZXRXaWRnZXQobV9jb21ibyk7CiAgICAgICAgIH0gZWxzZQogICAgICAg ICAgICAgbV9wcm94eS0+c2V0VmlzaWJsZSh0cnVlKTsK 58716 2010-06-14 15:50:33 -0700 2010-06-14 15:56:43 -0700 Patch update by comments. combobox03.diff text/plain 4959 ostap73 SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjExMzUpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTAtMDYtMTQgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAg PG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBDb21ib2JveCBkcm9wZG93biBib3ggaXMg c2VlbiB0d2ljZSBpbiBhIHdlYnBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MDA4MgorICAgICAgICAKKyAgICAgICAgRHJhd2luZyB0aGUgZHJv cGRvd25zIGNvbnNpc3Qgb2YgdHdvIHBhcnRzOiBkcmF3aW5nIHRoZSBjb21ib2JveCBpdHNlbGYg YW5kIAorICAgICAgICBkcmF3aW5nIHRoZSBkcm9wZG93biAob3IgcG9wdXAgYXMgaXRzIGNhbGxl ZCkuIFdoZW4gbm90IHVzaW5nIGdyYXBoaWNzIHZpZXcsIAorICAgICAgICBXZWJraXQgcmVuZGVy cyB0aGUgY29tYm9ib3ggaXRzZWxmIHZpYSBSZW5kZXJUaGVtZSwgYW5kIGRyYXdzIHRoZSBwb3B1 cCB1c2luZyAKKyAgICAgICAgUUNvbWJvQm94OjpzaG93UG9wdXAuIFdoZW4gdXNpbmcgUUdyYXBo aWNzV2ViVmlldyB0aGUgY29tYm9ib3ggZ2V0cyBkcmF3biB0d2ljZSAKKyAgICAgICAgYmVjYXVz ZSB0aGUgcG9wdXAgaXMgcmVuZGVyZWQgdmlhIGEgUUdyYXBoaWNzUHJveHlXaWRnZXQgdGhhdCBp cyB3cmFwcGluZyBhIFFDb21ib0JveC4gCisgICAgICAgIFNvLCBpbiBncmFwaGljcyBzY2VuZSB0 aGVyZSBpcyBhIGdyYXBoaWNzIGl0ZW0gaGF2aW5nIHRoZSBRQ29tYm9Cb3ggb24gdG9wIG9mIAor ICAgICAgICB0aGUgUUdyYXBoaWNzV2ViVmlldywgYW5kIHRoZSBRR3JhcGhpY3NXZWJWaWV3IGhh cyBhbHJlYWR5IGRyYXduIHRoZSBjb21ib2JveCBvbmNlLgorICAgICAgICAKKyAgICAgICAgV2hl biBjbGlja2luZyBzb21ld2hlcmUgb24gdGhlIHBhZ2UsIHdlIGFyZSBjYWxsaW5nIGhpZGVQb3B1 cCgpIGZvciB0aGUgcG9wdXAgYW5kIAorICAgICAgICBwcm94eS0+c2V0VmlzaWJsZShmYWxzZSkg Z2V0cyBjYWxsZWQgc3BlY2lmaWNhbGx5LiBIb3dldmVyLCB3aGVuIFFHcmFwaGljc1ZpZXcgbG9z ZXMgCisgICAgICAgIHRoZSBmb2N1cywgcG9wdXBzIGFyZSByZW1vdmVkIGJ1dCB0aGUgZ3JhcGhp Y3MgaXRlbSAoY29tYm9ib3gpIGl0c2VsZiBpcyBub3QuIFNvLCAKKyAgICAgICAgZ3JhcGhpY3Mg dmlldyByZWFsbHkgd29ya3MgYXMgZXhwZWN0ZWQuIEl0cyBub3QgZXZlbiBzdXBwb3NlZCB0byBy ZW1vdmUgYW55IGNvbWJvYm94ZXMgCisgICAgICAgIGFkZGVkIHRvIGl0IHdoZW4gdGhlIGZvY3Vz IGNoYW5nZXMsIGp1c3QgdG8gY2xvc2UgYW55IG9wZW4gcG9wdXBzLiBJdHMgbm90IHBvc3NpYmxl IAorICAgICAgICB0byBnZXQgZm9jdXMgZXZlbnRzIHRvIFFXZWJQb3B1cCBzbyB3ZSBjYW5ub3Qg anVzdCBjYWxsIHByb3h5LT5zZXRWaXNpYmxlKGZhbHNlKSAKKyAgICAgICAgd2hlbiBsb3Npbmcg dGhlIGZvY3VzLgorICAgICAgICAKKyAgICAgICAgVGhlIHJlYWwgcHJvYmxlbSBpcyB0aGF0IHdl IGFyZSBvdmVyZHJhd2luZyB0aGUgY29tYm9ib3ggd2hlbiB1c2luZyB0aGUgcHJveHkgd2lkZ2V0 LiAKKyAgICAgICAgT25lIHdheSB0byBmaXggdGhpcyB3b3VsZCBiZSB0byBtYWtlIHN1cmUgd2Ug YXJlIG5vdCBkcmF3aW5nIHR3aWNlLiBKdXN0IGluaGVyaXQgZnJvbSAKKyAgICAgICAgUUdyYXBo aWNzUHJveHlXaWRnZXQgYW5kIG92ZXJ3cml0ZSB0aGUgcGFpbnQgbWV0aG9kIGFuZCBkb250IGRy YXcgYW55dGhpbmcgdGhlcmUuCisgICAgICAgIAorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1F0 RmFsbGJhY2tXZWJQb3B1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpRdEZhbGxiYWNrV2ViUG9w dXBHcmFwaGljc1Byb3h5V2lkZ2V0OjpRdEZhbGxiYWNrV2ViUG9wdXBHcmFwaGljc1Byb3h5V2lk Z2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlF0RmFsbGJhY2tXZWJQb3B1cEdyYXBoaWNzUHJveHlX aWRnZXQ6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlF0dEZhbGxiYWNrV2ViUG9wdXA6OnNo b3cpOgorCiAyMDEwLTA2LTE0ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lh LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBTeW1iaWFuIGJ1aWxkIGZpeC4KSW5kZXg6IFdl YktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9wdXAuY3BwCShyZXZp c2lvbiA2MTEzNSkKKysrIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9RdEZhbGxiYWNrV2ViUG9w dXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2ICs0NCwzNCBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK2NsYXNzIFF0RmFsbGJhY2tXZWJQb3B1cENvbWJvUHJveHlXaWRnZXQgOiBwdWJs aWMgUUdyYXBoaWNzUHJveHlXaWRnZXQgeworcHVibGljOgorICAgIFF0RmFsbGJhY2tXZWJQb3B1 cENvbWJvUHJveHlXaWRnZXQoUUdyYXBoaWNzSXRlbSogcGFyZW50ID0gMCwgUXQ6OldpbmRvd0Zs YWdzIHdGbGFncyA9IDApIDogCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBRR3JhcGhpY3NQcm94eVdpZGdldChwYXJlbnQsIHdGbGFncykge30KKworLy8gIERyYXdpbmcg dGhlIGRyb3Bkb3ducyBjb25zaXN0IG9mIHR3byBwYXJ0czogZHJhd2luZyB0aGUgY29tYm9ib3gg aXRzZWxmIGFuZAorLy8gIGRyYXdpbmcgdGhlIGRyb3Bkb3duIChvciBwb3B1cCBhcyBpdHMgY2Fs bGVkKS4gV2hlbiBub3QgdXNpbmcgZ3JhcGhpY3MgdmlldywKKy8vICBXZWJraXQgcmVuZGVycyB0 aGUgY29tYm9ib3ggaXRzZWxmIHZpYSBSZW5kZXJUaGVtZSwgYW5kIGRyYXdzIHRoZSBwb3B1cCB1 c2luZworLy8gIFFDb21ib0JveDo6c2hvd1BvcHVwLiBXaGVuIHVzaW5nIFFHcmFwaGljc1dlYlZp ZXcgdGhlIGNvbWJvYm94IGdldHMgZHJhd24gdHdpY2UKKy8vICBiZWNhdXNlIHRoZSBwb3B1cCBp cyByZW5kZXJlZCB2aWEgYSBRR3JhcGhpY3NQcm94eVdpZGdldCB0aGF0IGlzIHdyYXBwaW5nIGEg UUNvbWJvQm94LgorLy8gIFNvLCBpbiBncmFwaGljcyBzY2VuZSB0aGVyZSBpcyBhIGdyYXBoaWNz IGl0ZW0gaGF2aW5nIHRoZSBRQ29tYm9Cb3ggb24gdG9wIG9mCisvLyAgdGhlIFFHcmFwaGljc1dl YlZpZXcsIGFuZCB0aGUgUUdyYXBoaWNzV2ViVmlldyBoYXMgYWxyZWFkeSBkcmF3biB0aGUgY29t Ym9ib3ggb25jZS4KKy8vCisvLyAgV2hlbiBjbGlja2luZyBzb21ld2hlcmUgb24gdGhlIHBhZ2Us IHdlIGFyZSBjYWxsaW5nIGhpZGVQb3B1cCgpIGZvciB0aGUgcG9wdXAgYW5kCisvLyAgcHJveHkt PnNldFZpc2libGUoZmFsc2UpIGdldHMgY2FsbGVkIHNwZWNpZmljYWxseS4gSG93ZXZlciwgd2hl biBRR3JhcGhpY3NWaWV3IGxvc2VzCisvLyAgdGhlIGZvY3VzLCBwb3B1cHMgYXJlIHJlbW92ZWQg YnV0IHRoZSBncmFwaGljcyBpdGVtIChjb21ib2JveCkgaXRzZWxmIGlzIG5vdC4gU28sCisvLyAg Z3JhcGhpY3MgdmlldyByZWFsbHkgd29ya3MgYXMgZXhwZWN0ZWQuIEl0cyBub3QgZXZlbiBzdXBw b3NlZCB0byByZW1vdmUgYW55IGNvbWJvYm94ZXMKKy8vICBhZGRlZCB0byBpdCB3aGVuIHRoZSBm b2N1cyBjaGFuZ2VzLCBqdXN0IHRvIGNsb3NlIGFueSBvcGVuIHBvcHVwcy4gSXRzIG5vdCBwb3Nz aWJsZQorLy8gIHRvIGdldCBmb2N1cyBldmVudHMgdG8gUVdlYlBvcHVwIHNvIHdlIGNhbm5vdCBq dXN0IGNhbGwgcHJveHktPnNldFZpc2libGUoZmFsc2UpCisvLyAgd2hlbiBsb3NpbmcgdGhlIGZv Y3VzLgorLy8KKy8vICBUaGUgcmVhbCBwcm9ibGVtIGlzIHRoYXQgd2UgYXJlIG92ZXJkcmF3aW5n IHRoZSBjb21ib2JveCB3aGVuIHVzaW5nIHRoZSBwcm94eSB3aWRnZXQKKy8vICBPbmUgd2F5IHRv IGZpeCB0aGlzIHdvdWxkIGJlIHRvIG1ha2Ugc3VyZSB3ZSBhcmUgbm90IGRyYXdpbmcgdHdpY2Uu IEp1c3QgaW5oZXJpdCBmcm9tCisvLyAgUUdyYXBoaWNzUHJveHlXaWRnZXQgYW5kIG92ZXJ3cml0 ZSB0aGUgcGFpbnQgbWV0aG9kIGFuZCBkb250IGRyYXcgYW55dGhpbmcgdGhlcmUuCisKKyAgICB2 b2lkIHBhaW50KFFQYWludGVyKiwgY29uc3QgUVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtKiwgUVdp ZGdldCopIHt9Cit9OworCiBRdEZhbGxiYWNrV2ViUG9wdXBDb21ibzo6UXRGYWxsYmFja1dlYlBv cHVwQ29tYm8oUXRGYWxsYmFja1dlYlBvcHVwJiBvd25lclBvcHVwKQogICAgIDogbV9vd25lclBv cHVwKG93bmVyUG9wdXApCiB7CkBAIC0xMTUsNyArMTQzLDcgQEAgdm9pZCBRdEZhbGxiYWNrV2Vi UG9wdXA6OnNob3coKQogICAgIFFSZWN0IHJlY3QgPSBnZW9tZXRyeSgpOwogICAgIGlmIChRR3Jh cGhpY3NXZWJWaWV3ICp3ZWJWaWV3ID0gcW9iamVjdF9jYXN0PFFHcmFwaGljc1dlYlZpZXcqPihw YWdlQ2xpZW50KCktPnBsdWdpblBhcmVudCgpKSkgewogICAgICAgICBpZiAoIW1fcHJveHkpIHsK LSAgICAgICAgICAgIG1fcHJveHkgPSBuZXcgUUdyYXBoaWNzUHJveHlXaWRnZXQod2ViVmlldyk7 CisgICAgICAgICAgICBtX3Byb3h5ID0gbmV3IFF0RmFsbGJhY2tXZWJQb3B1cENvbWJvUHJveHlX aWRnZXQod2ViVmlldyk7CiAgICAgICAgICAgICBtX3Byb3h5LT5zZXRXaWRnZXQobV9jb21ibyk7 CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgbV9wcm94eS0+c2V0VmlzaWJsZSh0cnVlKTsK 58719 2010-06-14 15:56:43 -0700 2010-12-24 02:38:48 -0800 Updated changelog. combobox03.diff text/plain 4949 ostap73 SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjExMzUpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTAtMDYtMTQgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAg PG9zdGFwZW5rby52aWF0Y2hlc2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBDb21ib2JveCBkcm9wZG93biBib3ggaXMg c2VlbiB0d2ljZSBpbiBhIHdlYnBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00MDA4MgorICAgICAgICAKKyAgICAgICAgRHJhd2luZyB0aGUgZHJv cGRvd25zIGNvbnNpc3Qgb2YgdHdvIHBhcnRzOiBkcmF3aW5nIHRoZSBjb21ib2JveCBpdHNlbGYg YW5kIAorICAgICAgICBkcmF3aW5nIHRoZSBkcm9wZG93biAob3IgcG9wdXAgYXMgaXRzIGNhbGxl ZCkuIFdoZW4gbm90IHVzaW5nIGdyYXBoaWNzIHZpZXcsIAorICAgICAgICBXZWJraXQgcmVuZGVy cyB0aGUgY29tYm9ib3ggaXRzZWxmIHZpYSBSZW5kZXJUaGVtZSwgYW5kIGRyYXdzIHRoZSBwb3B1 cCB1c2luZyAKKyAgICAgICAgUUNvbWJvQm94OjpzaG93UG9wdXAuIFdoZW4gdXNpbmcgUUdyYXBo aWNzV2ViVmlldyB0aGUgY29tYm9ib3ggZ2V0cyBkcmF3biB0d2ljZSAKKyAgICAgICAgYmVjYXVz ZSB0aGUgcG9wdXAgaXMgcmVuZGVyZWQgdmlhIGEgUUdyYXBoaWNzUHJveHlXaWRnZXQgdGhhdCBp cyB3cmFwcGluZyBhIFFDb21ib0JveC4gCisgICAgICAgIFNvLCBpbiBncmFwaGljcyBzY2VuZSB0 aGVyZSBpcyBhIGdyYXBoaWNzIGl0ZW0gaGF2aW5nIHRoZSBRQ29tYm9Cb3ggb24gdG9wIG9mIAor ICAgICAgICB0aGUgUUdyYXBoaWNzV2ViVmlldywgYW5kIHRoZSBRR3JhcGhpY3NXZWJWaWV3IGhh cyBhbHJlYWR5IGRyYXduIHRoZSBjb21ib2JveCBvbmNlLgorICAgICAgICAKKyAgICAgICAgV2hl biBjbGlja2luZyBzb21ld2hlcmUgb24gdGhlIHBhZ2UsIHdlIGFyZSBjYWxsaW5nIGhpZGVQb3B1 cCgpIGZvciB0aGUgcG9wdXAgYW5kIAorICAgICAgICBwcm94eS0+c2V0VmlzaWJsZShmYWxzZSkg Z2V0cyBjYWxsZWQgc3BlY2lmaWNhbGx5LiBIb3dldmVyLCB3aGVuIFFHcmFwaGljc1ZpZXcgbG9z ZXMgCisgICAgICAgIHRoZSBmb2N1cywgcG9wdXBzIGFyZSByZW1vdmVkIGJ1dCB0aGUgZ3JhcGhp Y3MgaXRlbSAoY29tYm9ib3gpIGl0c2VsZiBpcyBub3QuIFNvLCAKKyAgICAgICAgZ3JhcGhpY3Mg dmlldyByZWFsbHkgd29ya3MgYXMgZXhwZWN0ZWQuIEl0cyBub3QgZXZlbiBzdXBwb3NlZCB0byBy ZW1vdmUgYW55IGNvbWJvYm94ZXMgCisgICAgICAgIGFkZGVkIHRvIGl0IHdoZW4gdGhlIGZvY3Vz IGNoYW5nZXMsIGp1c3QgdG8gY2xvc2UgYW55IG9wZW4gcG9wdXBzLiBJdHMgbm90IHBvc3NpYmxl IAorICAgICAgICB0byBnZXQgZm9jdXMgZXZlbnRzIHRvIFFXZWJQb3B1cCBzbyB3ZSBjYW5ub3Qg anVzdCBjYWxsIHByb3h5LT5zZXRWaXNpYmxlKGZhbHNlKSAKKyAgICAgICAgd2hlbiBsb3Npbmcg dGhlIGZvY3VzLgorICAgICAgICAKKyAgICAgICAgVGhlIHJlYWwgcHJvYmxlbSBpcyB0aGF0IHdl IGFyZSBvdmVyZHJhd2luZyB0aGUgY29tYm9ib3ggd2hlbiB1c2luZyB0aGUgcHJveHkgd2lkZ2V0 LiAKKyAgICAgICAgT25lIHdheSB0byBmaXggdGhpcyB3b3VsZCBiZSB0byBtYWtlIHN1cmUgd2Ug YXJlIG5vdCBkcmF3aW5nIHR3aWNlLiBKdXN0IGluaGVyaXQgZnJvbSAKKyAgICAgICAgUUdyYXBo aWNzUHJveHlXaWRnZXQgYW5kIG92ZXJ3cml0ZSB0aGUgcGFpbnQgbWV0aG9kIGFuZCBkb250IGRy YXcgYW55dGhpbmcgdGhlcmUuCisgICAgICAgIAorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1F0 RmFsbGJhY2tXZWJQb3B1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpRdEZhbGxiYWNrV2ViUG9w dXBDb21ib1Byb3h5V2lkZ2V0OjpRdEZhbGxiYWNrV2ViUG9wdXBDb21ib1Byb3h5V2lkZ2V0KToK KyAgICAgICAgKFdlYkNvcmU6OlF0RmFsbGJhY2tXZWJQb3B1cENvbWJvUHJveHlXaWRnZXQ6OnBh aW50KToKKyAgICAgICAgKFdlYkNvcmU6OlF0RmFsbGJhY2tXZWJQb3B1cDo6c2hvdyk6CisKIDIw MTAtMDYtMTQgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIFN5bWJpYW4gYnVpbGQgZml4LgpJbmRleDogV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHJldmlzaW9uIDYxMTM1 KQorKysgV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1F0RmFsbGJhY2tXZWJQb3B1cC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDM0IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAor Y2xhc3MgUXRGYWxsYmFja1dlYlBvcHVwQ29tYm9Qcm94eVdpZGdldCA6IHB1YmxpYyBRR3JhcGhp Y3NQcm94eVdpZGdldCB7CitwdWJsaWM6CisgICAgUXRGYWxsYmFja1dlYlBvcHVwQ29tYm9Qcm94 eVdpZGdldChRR3JhcGhpY3NJdGVtKiBwYXJlbnQgPSAwLCBRdDo6V2luZG93RmxhZ3Mgd0ZsYWdz ID0gMCkgOiAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFHcmFwaGlj c1Byb3h5V2lkZ2V0KHBhcmVudCwgd0ZsYWdzKSB7fQorCisvLyAgRHJhd2luZyB0aGUgZHJvcGRv d25zIGNvbnNpc3Qgb2YgdHdvIHBhcnRzOiBkcmF3aW5nIHRoZSBjb21ib2JveCBpdHNlbGYgYW5k CisvLyAgZHJhd2luZyB0aGUgZHJvcGRvd24gKG9yIHBvcHVwIGFzIGl0cyBjYWxsZWQpLiBXaGVu IG5vdCB1c2luZyBncmFwaGljcyB2aWV3LAorLy8gIFdlYmtpdCByZW5kZXJzIHRoZSBjb21ib2Jv eCBpdHNlbGYgdmlhIFJlbmRlclRoZW1lLCBhbmQgZHJhd3MgdGhlIHBvcHVwIHVzaW5nCisvLyAg UUNvbWJvQm94OjpzaG93UG9wdXAuIFdoZW4gdXNpbmcgUUdyYXBoaWNzV2ViVmlldyB0aGUgY29t Ym9ib3ggZ2V0cyBkcmF3biB0d2ljZQorLy8gIGJlY2F1c2UgdGhlIHBvcHVwIGlzIHJlbmRlcmVk IHZpYSBhIFFHcmFwaGljc1Byb3h5V2lkZ2V0IHRoYXQgaXMgd3JhcHBpbmcgYSBRQ29tYm9Cb3gu CisvLyAgU28sIGluIGdyYXBoaWNzIHNjZW5lIHRoZXJlIGlzIGEgZ3JhcGhpY3MgaXRlbSBoYXZp bmcgdGhlIFFDb21ib0JveCBvbiB0b3Agb2YKKy8vICB0aGUgUUdyYXBoaWNzV2ViVmlldywgYW5k IHRoZSBRR3JhcGhpY3NXZWJWaWV3IGhhcyBhbHJlYWR5IGRyYXduIHRoZSBjb21ib2JveCBvbmNl LgorLy8KKy8vICBXaGVuIGNsaWNraW5nIHNvbWV3aGVyZSBvbiB0aGUgcGFnZSwgd2UgYXJlIGNh bGxpbmcgaGlkZVBvcHVwKCkgZm9yIHRoZSBwb3B1cCBhbmQKKy8vICBwcm94eS0+c2V0VmlzaWJs ZShmYWxzZSkgZ2V0cyBjYWxsZWQgc3BlY2lmaWNhbGx5LiBIb3dldmVyLCB3aGVuIFFHcmFwaGlj c1ZpZXcgbG9zZXMKKy8vICB0aGUgZm9jdXMsIHBvcHVwcyBhcmUgcmVtb3ZlZCBidXQgdGhlIGdy YXBoaWNzIGl0ZW0gKGNvbWJvYm94KSBpdHNlbGYgaXMgbm90LiBTbywKKy8vICBncmFwaGljcyB2 aWV3IHJlYWxseSB3b3JrcyBhcyBleHBlY3RlZC4gSXRzIG5vdCBldmVuIHN1cHBvc2VkIHRvIHJl bW92ZSBhbnkgY29tYm9ib3hlcworLy8gIGFkZGVkIHRvIGl0IHdoZW4gdGhlIGZvY3VzIGNoYW5n ZXMsIGp1c3QgdG8gY2xvc2UgYW55IG9wZW4gcG9wdXBzLiBJdHMgbm90IHBvc3NpYmxlCisvLyAg dG8gZ2V0IGZvY3VzIGV2ZW50cyB0byBRV2ViUG9wdXAgc28gd2UgY2Fubm90IGp1c3QgY2FsbCBw cm94eS0+c2V0VmlzaWJsZShmYWxzZSkKKy8vICB3aGVuIGxvc2luZyB0aGUgZm9jdXMuCisvLwor Ly8gIFRoZSByZWFsIHByb2JsZW0gaXMgdGhhdCB3ZSBhcmUgb3ZlcmRyYXdpbmcgdGhlIGNvbWJv Ym94IHdoZW4gdXNpbmcgdGhlIHByb3h5IHdpZGdldAorLy8gIE9uZSB3YXkgdG8gZml4IHRoaXMg d291bGQgYmUgdG8gbWFrZSBzdXJlIHdlIGFyZSBub3QgZHJhd2luZyB0d2ljZS4gSnVzdCBpbmhl cml0IGZyb20KKy8vICBRR3JhcGhpY3NQcm94eVdpZGdldCBhbmQgb3ZlcndyaXRlIHRoZSBwYWlu dCBtZXRob2QgYW5kIGRvbnQgZHJhdyBhbnl0aGluZyB0aGVyZS4KKworICAgIHZvaWQgcGFpbnQo UVBhaW50ZXIqLCBjb25zdCBRU3R5bGVPcHRpb25HcmFwaGljc0l0ZW0qLCBRV2lkZ2V0Kikge30K K307CisKIFF0RmFsbGJhY2tXZWJQb3B1cENvbWJvOjpRdEZhbGxiYWNrV2ViUG9wdXBDb21ibyhR dEZhbGxiYWNrV2ViUG9wdXAmIG93bmVyUG9wdXApCiAgICAgOiBtX293bmVyUG9wdXAob3duZXJQ b3B1cCkKIHsKQEAgLTExNSw3ICsxNDMsNyBAQCB2b2lkIFF0RmFsbGJhY2tXZWJQb3B1cDo6c2hv dygpCiAgICAgUVJlY3QgcmVjdCA9IGdlb21ldHJ5KCk7CiAgICAgaWYgKFFHcmFwaGljc1dlYlZp ZXcgKndlYlZpZXcgPSBxb2JqZWN0X2Nhc3Q8UUdyYXBoaWNzV2ViVmlldyo+KHBhZ2VDbGllbnQo KS0+cGx1Z2luUGFyZW50KCkpKSB7CiAgICAgICAgIGlmICghbV9wcm94eSkgewotICAgICAgICAg ICAgbV9wcm94eSA9IG5ldyBRR3JhcGhpY3NQcm94eVdpZGdldCh3ZWJWaWV3KTsKKyAgICAgICAg ICAgIG1fcHJveHkgPSBuZXcgUXRGYWxsYmFja1dlYlBvcHVwQ29tYm9Qcm94eVdpZGdldCh3ZWJW aWV3KTsKICAgICAgICAgICAgIG1fcHJveHktPnNldFdpZGdldChtX2NvbWJvKTsKICAgICAgICAg fSBlbHNlCiAgICAgICAgICAgICBtX3Byb3h5LT5zZXRWaXNpYmxlKHRydWUpOwo=