30336 2009-10-13 09:24:43 -0700 [Qt] Make context menu to work in QGraphicsWebView 2009-10-21 20:10:32 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 tonikitoo tonikitoo hausmann oldest_to_newest 154353 0 tonikitoo 2009-10-13 09:24:43 -0700 currently csm are not working in qgwv ... 154354 1 41106 tonikitoo 2009-10-13 09:27:59 -0700 Created attachment 41106 patch 0.1 154363 2 41110 tonikitoo 2009-10-13 09:44:59 -0700 Created attachment 41110 patch 0.2 - same as 0.1, but not leaky 154460 3 41110 hausmann 2009-10-13 15:19:38 -0700 Comment on attachment 41110 patch 0.2 - same as 0.1, but not leaky Argh, I'm sorry Antonio, I overlooked two details about the patch :-/ > + if (QGraphicsSceneContextMenuEvent* ev = static_cast<QGraphicsSceneContextMenuEvent*>(event)) { This if (and scope) isn't necessary, as the cast can't fail and as event is guaranteed to be non-zero. > + QContextMenuEvent fakeEvent(QContextMenuEvent(QContextMenuEvent::Mouse, ev->pos().toPoint())); It looks like there's a redundant nesting :), i.e. the could should probably read QContextMenuEvent fakeEvent(reason, ev->pos().toPoint()); instead of QContextMenuEvent fakeEvent(QContextMenuEvent(...)); I also think we should map ev->reason() to the QContextMenuEvent::Reason. Sorry :-/, I should've spotted this on the first review. 154510 4 41144 tonikitoo 2009-10-13 18:30:59 -0700 Created attachment 41144 landed in r49618 - patch 0.3 > Argh, I'm sorry Antonio, I overlooked two details about the patch :-/ > I should've spotted this on the first review. thx again for re-reviewing, simon. > > + if (QGraphicsSceneContextMenuEvent* ev = static_cast<QGraphicsSceneContextMenuEvent*>(event)) { > This if (and scope) isn't necessary, as the cast can't fail and as event is > guaranteed to be non-zero. totally agree. done ... > > + QContextMenuEvent fakeEvent(QContextMenuEvent(QContextMenuEvent::Mouse, ev->pos().toPoint())); > It looks like there's a redundant nesting :), i.e. the could should probably > read errr ... likely copy and paste error. fixed. > I also think we should map ev->reason() to the QContextMenuEvent::Reason. true. also done. 154535 5 41144 hausmann 2009-10-13 22:05:13 -0700 Comment on attachment 41144 landed in r49618 - patch 0.3 Thanks! 154769 6 tonikitoo 2009-10-15 05:43:00 -0700 landed in r49618 154832 7 41144 tonikitoo 2009-10-15 10:17:59 -0700 Comment on attachment 41144 landed in r49618 - patch 0.3 clearing r+ flag since patch has landed. 156763 8 tonikitoo 2009-10-21 20:10:32 -0700 *** Bug 29180 has been marked as a duplicate of this bug. *** 41106 2009-10-13 09:27:59 -0700 2009-10-13 09:44:59 -0700 patch 0.1 0001--Qt-Make-context-menu-to-work-in-QGraphicsWebView.patch text/plain 2322 tonikitoo RnJvbSA0NmJlYmFlOTA3OWZjNjEzMmFjMzY1Zjk4ZmMwMzk0OTIzMTQ3NmQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAxMyBPY3QgMjAwOSAxMjoyNjo1NSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gTWFrZSBjb250ZXh0IG1lbnUgdG8gd29yayBpbiBRR3JhcGhpY3NXZWJWaWV3CiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAzMzYKClBhdGNoIGJ5IEFudG9uaW8g R29tZXMgPHRvbmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEwLTEzClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5jcHA6CihRR3JhcGhpY3NXZWJW aWV3OjpldmVudCk6Ci0tLQogV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcCB8ICAg MTYgKysrKysrKysrKysrKysrKwogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICB8 ICAgMTAgKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5j cHAgYi9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDFlNDlkM2UuLjBh ZTkzNTIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysr IGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMjQ5LDYgKzI0OSwyMiBA QCBib29sIFFHcmFwaGljc1dlYlZpZXc6OmV2ZW50KFFFdmVudCogZXZlbnQpCiAgICAgLy8gUmUt aW1wbGVtZW50ZWQgaW4gb3JkZXIgdG8gYWxsb3dzIGZpeGluZyBldmVudC1yZWxhdGVkIGJ1Z3Mg aW4gcGF0Y2ggcmVsZWFzZXMuCiAKICAgICBpZiAoZC0+cGFnZSkgeworI2lmbmRlZiBRVF9OT19D T05URVhUTUVOVQorICAgICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBRRXZlbnQ6OkdyYXBoaWNz U2NlbmVDb250ZXh0TWVudSkgeworICAgICAgICAgICAgaWYgKCFpc0VuYWJsZWQoKSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIGlmIChRR3JhcGhpY3NTY2Vu ZUNvbnRleHRNZW51RXZlbnQqIGV2ID0gc3RhdGljX2Nhc3Q8UUdyYXBoaWNzU2NlbmVDb250ZXh0 TWVudUV2ZW50Kj4oZXZlbnQpKSB7CisgICAgICAgICAgICAgICAgUUNvbnRleHRNZW51RXZlbnQg KmZha2VFdmVudCA9IG5ldyBRQ29udGV4dE1lbnVFdmVudChRQ29udGV4dE1lbnVFdmVudDo6TW91 c2UsIGV2LT5wb3MoKS50b1BvaW50KCkpOworICAgICAgICAgICAgICAgIGlmIChkLT5wYWdlLT5z d2FsbG93Q29udGV4dE1lbnVFdmVudChmYWtlRXZlbnQpKSB7CisgICAgICAgICAgICAgICAgICAg IGV2ZW50LT5hY2NlcHQoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGQtPnBhZ2UtPnVwZGF0ZVBvc2l0aW9uRGVw ZW5kZW50QWN0aW9ucyhmYWtlRXZlbnQtPnBvcygpKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorI2VuZGlmIC8vIFFUX05PX0NP TlRFWFRNRU5VCiAjaWZuZGVmIFFUX05PX0NVUlNPUgogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA0 MDAKICAgICAgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IFFFdmVudDo6Q3Vyc29yQ2hh bmdlKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5n ZUxvZwppbmRleCA0NDgyMWI0Li5hNjU4NGUxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0xMC0x MyAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gTWFrZSBjb250ZXh0IG1lbnUg dG8gd29yayBpbiBRR3JhcGhpY3NXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMDMzNgorCisgICAgICAgICogQXBpL3FncmFwaGljc3dlYnZp ZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6ZXZlbnQpOgorCiAyMDA5LTEwLTEz ICBHaXJpc2ggUmFtYWtyaXNobmFuICA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgotLSAKMS42LjAuNAoK 41110 2009-10-13 09:44:59 -0700 2009-10-13 18:30:59 -0700 patch 0.2 - same as 0.1, but not leaky 0002--Qt-Make-context-menu-to-work-in-QGraphicsWebView.patch text/plain 2316 tonikitoo RnJvbSBkNjRkNjdmYzgxZmUzOTM1MzQwZGFmMTMxZGU0OGY1MjFkNDdhNmFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAxMyBPY3QgMjAwOSAxMjoyNjo1NSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gTWFrZSBjb250ZXh0IG1lbnUgdG8gd29yayBpbiBRR3JhcGhpY3NXZWJWaWV3CiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAzMzYKClBhdGNoIGJ5IEFudG9uaW8g R29tZXMgPHRvbmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEwLTEzClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5jcHA6CihRR3JhcGhpY3NXZWJW aWV3OjpldmVudCk6Ci0tLQogV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcCB8ICAg MTYgKysrKysrKysrKysrKysrKwogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICB8 ICAgMTAgKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5j cHAgYi9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCmluZGV4IDFlNDlkM2UuLjVm ZWU1ZDkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKKysr IGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcApAQCAtMjQ5LDYgKzI0OSwyMiBA QCBib29sIFFHcmFwaGljc1dlYlZpZXc6OmV2ZW50KFFFdmVudCogZXZlbnQpCiAgICAgLy8gUmUt aW1wbGVtZW50ZWQgaW4gb3JkZXIgdG8gYWxsb3dzIGZpeGluZyBldmVudC1yZWxhdGVkIGJ1Z3Mg aW4gcGF0Y2ggcmVsZWFzZXMuCiAKICAgICBpZiAoZC0+cGFnZSkgeworI2lmbmRlZiBRVF9OT19D T05URVhUTUVOVQorICAgICAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBRRXZlbnQ6OkdyYXBoaWNz U2NlbmVDb250ZXh0TWVudSkgeworICAgICAgICAgICAgaWYgKCFpc0VuYWJsZWQoKSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIGlmIChRR3JhcGhpY3NTY2Vu ZUNvbnRleHRNZW51RXZlbnQqIGV2ID0gc3RhdGljX2Nhc3Q8UUdyYXBoaWNzU2NlbmVDb250ZXh0 TWVudUV2ZW50Kj4oZXZlbnQpKSB7CisgICAgICAgICAgICAgICAgUUNvbnRleHRNZW51RXZlbnQg ZmFrZUV2ZW50KFFDb250ZXh0TWVudUV2ZW50KFFDb250ZXh0TWVudUV2ZW50OjpNb3VzZSwgZXYt PnBvcygpLnRvUG9pbnQoKSkpOworICAgICAgICAgICAgICAgIGlmIChkLT5wYWdlLT5zd2FsbG93 Q29udGV4dE1lbnVFdmVudCgmZmFrZUV2ZW50KSkgeworICAgICAgICAgICAgICAgICAgICBldmVu dC0+YWNjZXB0KCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICBkLT5wYWdlLT51cGRhdGVQb3NpdGlvbkRlcGVuZGVu dEFjdGlvbnMoZmFrZUV2ZW50LnBvcygpKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorI2VuZGlmIC8vIFFUX05PX0NPTlRFWFRN RU5VCiAjaWZuZGVmIFFUX05PX0NVUlNPUgogI2lmIFFUX1ZFUlNJT04gPj0gMHgwNDA0MDAKICAg ICAgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IFFFdmVudDo6Q3Vyc29yQ2hhbmdlKSB7 CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpp bmRleCA0NDgyMWI0Li5hNjU4NGUxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0xMC0xMyAgQW50 b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gTWFrZSBjb250ZXh0IG1lbnUgdG8gd29y ayBpbiBRR3JhcGhpY3NXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zMDMzNgorCisgICAgICAgICogQXBpL3FncmFwaGljc3dlYnZpZXcuY3Bw OgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6ZXZlbnQpOgorCiAyMDA5LTEwLTEzICBHaXJp c2ggUmFtYWtyaXNobmFuICA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgotLSAKMS42LjAuNAoK 41144 2009-10-13 18:30:59 -0700 2009-10-15 10:17:59 -0700 landed in r49618 - patch 0.3 0003--Qt-Make-context-menu-to-work-in-QGraphicsWebView.patch text/plain 2229 tonikitoo RnJvbSBkYmJmM2UwOGZkZTMyNzgzOWIzZGQ1NjZkNTY5ZTkxZmVhMjZmMzA3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAxMyBPY3QgMjAwOSAxMjoyNjo1NSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtR dF0gTWFrZSBjb250ZXh0IG1lbnUgdG8gd29yayBpbiBRR3JhcGhpY3NXZWJWaWV3CiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAzMzYKClBhdGNoIGJ5IEFudG9uaW8g R29tZXMgPHRvbmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEwLTEzClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBBcGkvcWdyYXBoaWNzd2Vidmlldy5jcHA6CihRR3JhcGhpY3NXZWJW aWV3OjpldmVudCk6Ci0tLQogV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcCB8ICAg MTQgKysrKysrKysrKysrKysKIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgfCAg IDEwICsrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3Bw IGIvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAppbmRleCAxZTQ5ZDNlLi43NTk5 ZDg4IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCisrKyBi L1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKQEAgLTI0OSw2ICsyNDksMjAgQEAg Ym9vbCBRR3JhcGhpY3NXZWJWaWV3OjpldmVudChRRXZlbnQqIGV2ZW50KQogICAgIC8vIFJlLWlt cGxlbWVudGVkIGluIG9yZGVyIHRvIGFsbG93cyBmaXhpbmcgZXZlbnQtcmVsYXRlZCBidWdzIGlu IHBhdGNoIHJlbGVhc2VzLgogCiAgICAgaWYgKGQtPnBhZ2UpIHsKKyNpZm5kZWYgUVRfTk9fQ09O VEVYVE1FTlUKKyAgICAgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gUUV2ZW50OjpHcmFwaGljc1Nj ZW5lQ29udGV4dE1lbnUpIHsKKyAgICAgICAgICAgIGlmICghaXNFbmFibGVkKCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgICAgICBRR3JhcGhpY3NTY2VuZUNvbnRl eHRNZW51RXZlbnQqIGV2ID0gc3RhdGljX2Nhc3Q8UUdyYXBoaWNzU2NlbmVDb250ZXh0TWVudUV2 ZW50Kj4oZXZlbnQpOworICAgICAgICAgICAgUUNvbnRleHRNZW51RXZlbnQgZmFrZUV2ZW50KFFD b250ZXh0TWVudUV2ZW50OjpSZWFzb24oZXYtPnJlYXNvbigpKSwgZXYtPnBvcygpLnRvUG9pbnQo KSk7CisgICAgICAgICAgICBpZiAoZC0+cGFnZS0+c3dhbGxvd0NvbnRleHRNZW51RXZlbnQoJmZh a2VFdmVudCkpIHsKKyAgICAgICAgICAgICAgICBldmVudC0+YWNjZXB0KCk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBkLT5wYWdlLT51 cGRhdGVQb3NpdGlvbkRlcGVuZGVudEFjdGlvbnMoZmFrZUV2ZW50LnBvcygpKTsKKyAgICAgICAg fQorI2VuZGlmIC8vIFFUX05PX0NPTlRFWFRNRU5VCiAjaWZuZGVmIFFUX05PX0NVUlNPUgogI2lm IFFUX1ZFUlNJT04gPj0gMHgwNDA0MDAKICAgICAgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgp ID09IFFFdmVudDo6Q3Vyc29yQ2hhbmdlKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdl TG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA0NDgyMWI0Li5hNjU4NGUxIDEwMDY0NAot LS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAwOS0xMC0xMyAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQu b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtR dF0gTWFrZSBjb250ZXh0IG1lbnUgdG8gd29yayBpbiBRR3JhcGhpY3NXZWJWaWV3CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDMzNgorCisgICAgICAg ICogQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6 ZXZlbnQpOgorCiAyMDA5LTEwLTEzICBHaXJpc2ggUmFtYWtyaXNobmFuICA8Z2lyaXNoQGZvcndh cmRiaWFzLmluPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgotLSAKMS42 LjAuNAoK