23712 2009-02-03 14:07:59 -0800 Add support for disabled items in PopupMenu and other QPopupMenu polish 2009-11-24 06:39:38 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC Linux RESOLVED DUPLICATE 27772 Qt P2 Enhancement --- 0 ben webkit-unassigned hausmann oldest_to_newest 108165 0 ben 2009-02-03 14:07:59 -0800 - Rather then using "---" as a separator a real separator is now used - Items that are disabled are now disabled - Items that are selected are now selected Patch: http://code.staikos.net/cgi-bin/gitweb.cgi?p=webkit;a=commit;h=bae84a3e74a73984e5ba998eb5b29648b7a92e47 117620 1 29504 ben 2009-04-15 11:13:09 -0700 Created attachment 29504 Patch for task 166052 2 hausmann 2009-11-24 06:39:38 -0800 *** This bug has been marked as a duplicate of bug 27772 *** 29504 2009-04-15 11:13:09 -0700 2009-04-15 11:13:09 -0700 Patch for task 0001--2009-02-03-Benjamin-C-Meyer-benjamin.meyer-tor.patch text/plain 2490 ben RnJvbSAwMDVkMTQ5MmVjZTc4MTU4YzhlYmUxOTg2MzE4ZmZlYzM3MmJjZmMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCZW5qYW1pbiBDIE1leWVyIDxiZW5qYW1pbi5tZXllckB0b3Jj aG1vYmlsZS5jb20+CkRhdGU6IFR1ZSwgMyBGZWIgMjAwOSAxNzowMjo1NiAtMDUwMApTdWJqZWN0 OiBbUEFUQ0hdICAgICAyMDA5LTAyLTAzICBCZW5qYW1pbiBDIE1leWVyIDxiZW5qYW1pbi5tZXll ckB0b3JjaG1vYmlsZS5jb20+CgogICAgICAgIFVzZSBhIHByb3BlciBzZXBhcmF0b3IgaW4gYW5k IGFkZCBzdXBwb3J0IGZvciBkaXNhYmxlZCBhbmQgc2VsZWN0ZWQgaXRlbXMuCgogICAgICAgICog UG9wdXBNZW51UXQuY3BwCi0tLQogV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAg fCAgIDMzICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlcyBjaGFuZ2Vk LCAxNiBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL3F0L1BvcHVwTWVudVF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvUG9wdXBN ZW51UXQuY3BwCmluZGV4IDc2NzI4ZmEuLmE0YjIwNTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvUG9wdXBN ZW51UXQuY3BwCkBAIC00MCw2ICs0MCw3IEBACiAjaW5jbHVkZSA8UUxpc3RXaWRnZXQ+CiAjaW5j bHVkZSA8UUxpc3RXaWRnZXRJdGVtPgogI2luY2x1ZGUgPFFXaWRnZXRBY3Rpb24+CisjaW5jbHVk ZSA8UVN0YW5kYXJkSXRlbU1vZGVsPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTY1LDI1 ICs2NiwyMyBAQCB2b2lkIFBvcHVwTWVudTo6cG9wdWxhdGUoY29uc3QgSW50UmVjdCYgcikKICAg ICBRX0FTU0VSVChjbGllbnQoKSk7CiAKICAgICBpbnQgc2l6ZSA9IGNsaWVudCgpLT5saXN0U2l6 ZSgpOwotICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZTsgaSsrKSB7CisgICAgUVN0YW5kYXJk SXRlbU1vZGVsICptb2RlbCA9IHFvYmplY3RfY2FzdDxRU3RhbmRhcmRJdGVtTW9kZWwqPihtX3Bv cHVwLT5tb2RlbCgpKTsKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IHNpemU7ICsraSkgewogICAg ICAgICBpZiAoY2xpZW50KCktPml0ZW1Jc1NlcGFyYXRvcihpKSkgewotICAgICAgICAgICAgLy9G SVhNRTogYmV0dGVyIHNlcGVyYXRvciBpdGVtCi0gICAgICAgICAgICBtX3BvcHVwLT5pbnNlcnRJ dGVtKGksIFFTdHJpbmc6OmZyb21MYXRpbjEoIi0tLSIpKTsKLSAgICAgICAgfQotICAgICAgICBl bHNlIHsKLSAgICAgICAgICAgIC8vUG9wdXBNZW51U3R5bGUgc3R5bGUgPSBjbGllbnQoKS0+aXRl bVN0eWxlKGkpOworICAgICAgICAgICAgbV9wb3B1cC0+aW5zZXJ0U2VwYXJhdG9yKGkpOworICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgbV9wb3B1cC0+aW5zZXJ0SXRlbShpLCBjbGllbnQo KS0+aXRlbVRleHQoaSkpOwotI2lmIDAKLSAgICAgICAgICAgIGl0ZW0gPSBuZXcgUUxpc3RXaWRn ZXRJdGVtKGNsaWVudCgpLT5pdGVtVGV4dChpKSk7Ci0gICAgICAgICAgICBtX2FjdGlvbnMuaW5z ZXJ0KGl0ZW0sIGkpOwotICAgICAgICAgICAgaWYgKHN0eWxlLT5mb250KCkgIT0gRm9udCgpKQot ICAgICAgICAgICAgICAgIGl0ZW0tPnNldEZvbnQoc3R5bGUtPmZvbnQoKSk7Ci0KLSAgICAgICAg ICAgIFF0OjpJdGVtRmxhZ3MgZmxhZ3MgPSBRdDo6SXRlbUlzU2VsZWN0YWJsZTsKLSAgICAgICAg ICAgIGlmIChjbGllbnQoKS0+aXRlbUlzRW5hYmxlZChpKSkKLSAgICAgICAgICAgICAgICBmbGFn cyB8PSBRdDo6SXRlbUlzRW5hYmxlZDsKLSAgICAgICAgICAgIGl0ZW0tPnNldEZsYWdzKGZsYWdz KTsKLSNlbmRpZgorICAgICAgICAgICAgaWYgKG1vZGVsICYmICFjbGllbnQoKS0+aXRlbUlzRW5h YmxlZChpKSkgeworICAgICAgICAgICAgICAgIFFNb2RlbEluZGV4IGlkeCA9IG1vZGVsLT5pbmRl eChpLCBtX3BvcHVwLT5tb2RlbENvbHVtbigpLCBtX3BvcHVwLT5yb290TW9kZWxJbmRleCgpKTsK KyAgICAgICAgICAgICAgICBRU3RhbmRhcmRJdGVtICppdGVtID0gbW9kZWwtPml0ZW1Gcm9tSW5k ZXgoaWR4KTsKKyAgICAgICAgICAgICAgICBRdDo6SXRlbUZsYWdzIGZsYWdzID0gbW9kZWwtPmZs YWdzKGlkeCk7CisgICAgICAgICAgICAgICAgUXQ6Okl0ZW1GbGFncyBkaXNhYmxlZEZsYWdzID0g ZmxhZ3M7CisgICAgICAgICAgICAgICAgZGlzYWJsZWRGbGFncyAmPSB+UXQ6Okl0ZW1Jc0VuYWJs ZWQ7CisgICAgICAgICAgICAgICAgaXRlbS0+c2V0RmxhZ3MoZGlzYWJsZWRGbGFncyk7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICBpZiAoY2xpZW50KCktPml0ZW1Jc1NlbGVjdGVkKGkpKSB7 CisgICAgICAgICAgICAgICAgbV9wb3B1cC0+c2V0Q3VycmVudEluZGV4KGkpOworICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgfQogfQotLSAKMS42LjAuNAoK