27772 2009-07-28 11:31:48 -0700 PopupMenuQt lacks disabled and selected support 2009-11-24 06:39:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 mifenton webkit-unassigned ben manyoso oldest_to_newest 135293 0 mifenton 2009-07-28 11:31:48 -0700 PopupMenuQt previously had a code block defined out that was meant to provide the ability to disable entries and select the current entry. This functionality should be re-instated. 135314 1 33658 mifenton 2009-07-28 12:05:30 -0700 Created attachment 33658 Patch that enables selected and disabled support for PopupMenuQt. 135861 2 33658 manyoso 2009-07-30 09:41:06 -0700 Comment on attachment 33658 Patch that enables selected and disabled support for PopupMenuQt. > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > + QStandardItemModel *model = qobject_cast<QStandardItemModel*>(m_popup->model()); > + Q_ASSERT(model); Style decoration problem. See coding guidelines. > + if (client()->itemIsSelected(i)) > + m_popup->setCurrentIndex(i); The big fear I have is that QComboBox uses QStandardItemModel internally... if they change that to using something else we'll be asserting. How about this... Still ASSERT on the model, but further down replace with: if (model && !client()->itemIsEnabled()) That way we won't worry in release builds. Sound ok? 135901 3 33795 mifenton 2009-07-30 11:37:53 -0700 Created attachment 33795 Patch with updated style / model check. Thanks for the review. Patch is updated as suggested. 135912 4 33795 manyoso 2009-07-30 11:58:27 -0700 Comment on attachment 33795 Patch with updated style / model check. > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > + > + if (model && !client()->itemIsEnabled(i)) > + model->item(i)->setEnabled(false); > + > + if (client()->itemIsSelected(i)) > + m_popup->setCurrentIndex(i); > + } Indentation is not quite right, but I'll fix it when I land. Otherwise r=me! 135920 5 manyoso 2009-07-30 12:08:14 -0700 Landed with r46593. 166053 6 hausmann 2009-11-24 06:39:38 -0800 *** Bug 23712 has been marked as a duplicate of this bug. *** 33658 2009-07-28 12:05:30 -0700 2009-07-30 11:37:53 -0700 Patch that enables selected and disabled support for PopupMenuQt. PopupMenuQtModePatch.diff text/plain 1674 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDgzMTk1Yy4uYjQ2ZjZmYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0yOCAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHByZXZpb3VzbHkgZGVmaW5lZCBvdXQgc3VwcG9y dCB0byBQb3B1cE1lbnVRdCBmb3IgbWFya2luZyBlbnRyaWVzIGFzCisgICAgICAgIGRpc2FibGVk IGFuZCBmb3Igc2VsZWN0aW5nIHRoZSBkZXNpcmVkIGl0ZW0uCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NzcyCisKKyAgICAgICAgKiBwbGF0Zm9y bS9xdC9Qb3B1cE1lbnVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnU6OnBvcHVs YXRlKToKKwogMjAwOS0wNy0yOCAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bmlrb2xhcy56aW1tZXJt YW5uQHRvcmNobW9iaWxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9yZ2UgU3RhaWtv cy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKaW5kZXggNjNhNzUyMy4uOTlhZDhjNiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNs dWRlIDxRTGlzdFdpZGdldEl0ZW0+CiAjaW5jbHVkZSA8UU1lbnU+CiAjaW5jbHVkZSA8UVBvaW50 PgorI2luY2x1ZGUgPFFTdGFuZGFyZEl0ZW1Nb2RlbD4KICNpbmNsdWRlIDxRV2lkZ2V0QWN0aW9u PgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC02MywxMiArNjQsMjIgQEAgdm9pZCBQb3B1cE1l bnU6OnBvcHVsYXRlKGNvbnN0IEludFJlY3QmIHIpCiAgICAgY2xlYXIoKTsKICAgICBRX0FTU0VS VChjbGllbnQoKSk7CiAKKyAgICBRU3RhbmRhcmRJdGVtTW9kZWwgKm1vZGVsID0gcW9iamVjdF9j YXN0PFFTdGFuZGFyZEl0ZW1Nb2RlbCo+KG1fcG9wdXAtPm1vZGVsKCkpOworICAgIFFfQVNTRVJU KG1vZGVsKTsKKwogICAgIGludCBzaXplID0gY2xpZW50KCktPmxpc3RTaXplKCk7CiAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsKICAgICAgICAgaWYgKGNsaWVudCgpLT5pdGVt SXNTZXBhcmF0b3IoaSkpCiAgICAgICAgICAgICBtX3BvcHVwLT5pbnNlcnRTZXBhcmF0b3IoaSk7 Ci0gICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBtX3BvcHVwLT5pbnNl cnRJdGVtKGksIGNsaWVudCgpLT5pdGVtVGV4dChpKSk7CisKKyAgICAgICAgICAgIGlmICghY2xp ZW50KCktPml0ZW1Jc0VuYWJsZWQoaSkpCisgICAgICAgICAgICAgIG1vZGVsLT5pdGVtKGkpLT5z ZXRFbmFibGVkKGZhbHNlKTsKKworICAgICAgICAgICAgaWYgKGNsaWVudCgpLT5pdGVtSXNTZWxl Y3RlZChpKSkKKyAgICAgICAgICAgICAgICBtX3BvcHVwLT5zZXRDdXJyZW50SW5kZXgoaSk7Cisg ICAgICAgIH0KICAgICB9CiB9CiAK 33795 2009-07-30 11:37:53 -0700 2009-07-30 11:58:27 -0700 Patch with updated style / model check. revisedPopupMenuQtModePatch.diff text/plain 1665 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTlkMzJjNS4uZmY2NzI3OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0yOSAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHByZXZpb3VzbHkgZGVmaW5lZCBvdXQgc3VwcG9y dCB0byBQb3B1cE1lbnVRdCBmb3IgbWFya2luZyBlbnRyaWVzIGFzCisgICAgICAgIGRpc2FibGVk IGFuZCBmb3Igc2VsZWN0aW5nIHRoZSBkZXNpcmVkIGl0ZW0uCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NzcyCisKKyAgICAgICAgKiBwbGF0Zm9y bS9xdC9Qb3B1cE1lbnVRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnU6OnBvcHVs YXRlKToKKwogMjAwOS0wNy0yOSAgWW9uZ2p1biBaaGFuZyAgPHlvbmdqdW4uemhhbmdAbm9raWEu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL3F0 L1BvcHVwTWVudVF0LmNwcAppbmRleCA2M2E3NTIzLi43YmZjNGFmIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL3F0L1BvcHVwTWVudVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL3F0 L1BvcHVwTWVudVF0LmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0 SXRlbT4KICNpbmNsdWRlIDxRTWVudT4KICNpbmNsdWRlIDxRUG9pbnQ+CisjaW5jbHVkZSA8UVN0 YW5kYXJkSXRlbU1vZGVsPgogI2luY2x1ZGUgPFFXaWRnZXRBY3Rpb24+CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKQEAgLTYzLDEyICs2NCwyMiBAQCB2b2lkIFBvcHVwTWVudTo6cG9wdWxhdGUoY29u c3QgSW50UmVjdCYgcikKICAgICBjbGVhcigpOwogICAgIFFfQVNTRVJUKGNsaWVudCgpKTsKIAor ICAgIFFTdGFuZGFyZEl0ZW1Nb2RlbCogbW9kZWwgPSBxb2JqZWN0X2Nhc3Q8UVN0YW5kYXJkSXRl bU1vZGVsKj4obV9wb3B1cC0+bW9kZWwoKSk7CisgICAgUV9BU1NFUlQobW9kZWwpOworCiAgICAg aW50IHNpemUgPSBjbGllbnQoKS0+bGlzdFNpemUoKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8 IHNpemU7IGkrKykgewogICAgICAgICBpZiAoY2xpZW50KCktPml0ZW1Jc1NlcGFyYXRvcihpKSkK ICAgICAgICAgICAgIG1fcG9wdXAtPmluc2VydFNlcGFyYXRvcihpKTsKLSAgICAgICAgZWxzZQor ICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIG1fcG9wdXAtPmluc2VydEl0ZW0oaSwgY2xpZW50 KCktPml0ZW1UZXh0KGkpKTsKKworICAgICAgICAgICAgaWYgKG1vZGVsICYmICFjbGllbnQoKS0+ aXRlbUlzRW5hYmxlZChpKSkKKyAgICAgICAgICAgICAgbW9kZWwtPml0ZW0oaSktPnNldEVuYWJs ZWQoZmFsc2UpOworCisgICAgICAgICAgICBpZiAoY2xpZW50KCktPml0ZW1Jc1NlbGVjdGVkKGkp KQorICAgICAgICAgICAgICAgIG1fcG9wdXAtPnNldEN1cnJlbnRJbmRleChpKTsKKyAgICAgICAg fQogICAgIH0KIH0K