21900 2008-10-27 11:30:55 -0700 wx port doesn't draw text caret 2008-10-27 15:17:52 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 kevinwatters webkit-unassigned oldest_to_newest 96745 0 kevinwatters 2008-10-27 11:30:55 -0700 Active and focus states get out of sync in the wx port, resulting in the text control caret not being drawn. 96746 1 24688 kevinwatters 2008-10-27 11:31:25 -0700 Created attachment 24688 fix caret drawing in the wx port 96787 2 24688 kevino 2008-10-27 14:47:21 -0700 Comment on attachment 24688 fix caret drawing in the wx port > diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog > index 3d105b4..1a6e911 100644 > --- a/WebKit/wx/ChangeLog > +++ b/WebKit/wx/ChangeLog > @@ -1,3 +1,14 @@ > +2008-10-27 Kevin Watters <kevinwatters@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Update the active state as well as the focused state as both need to be true > + for the caret to be drawn. > + > + * WebView.cpp: > + (wxWebView::OnSetFocus): > + (wxWebView::OnKillFocus): > + > 2008-10-25 Kevin Ollivier <kevino@theolliviers.com> > > wx build fix. > diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp > index 0c4cb66..546518f 100644 > --- a/WebKit/wx/WebView.cpp > +++ b/WebKit/wx/WebView.cpp > @@ -564,8 +564,10 @@ void wxWebView::OnSetFocus(wxFocusEvent& event) > if (m_mainFrame) > frame = m_mainFrame->GetFrame(); > > - if (frame) > + if (frame) { > + m_impl->page->focusController()->setActive(true); > frame->selection()->setFocused(true); > + } > > event.Skip(); > } > @@ -576,9 +578,10 @@ void wxWebView::OnKillFocus(wxFocusEvent& event) > if (m_mainFrame) > frame = m_mainFrame->GetFrame(); > > - if (frame) > + if (frame) { > + m_impl->page->focusController()->setActive(false); > frame->selection()->setFocused(false); > - > + } > event.Skip(); > } > 96789 3 kevino 2008-10-27 15:17:52 -0700 Landed in r37906, thanks! 24688 2008-10-27 11:31:25 -0700 2008-10-27 14:47:21 -0700 fix caret drawing in the wx port wx_caret_fix.patch text/plain 1333 kevinwatters ZGlmZiAtLWdpdCBhL1dlYktpdC93eC9DaGFuZ2VMb2cgYi9XZWJLaXQvd3gvQ2hhbmdlTG9nCmlu ZGV4IDNkMTA1YjQuLjFhNmU5MTEgMTAwNjQ0Ci0tLSBhL1dlYktpdC93eC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3d4L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA4LTEwLTI3ICBLZXZp biBXYXR0ZXJzICA8a2V2aW53YXR0ZXJzQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFVwZGF0ZSB0aGUgYWN0aXZlIHN0 YXRlIGFzIHdlbGwgYXMgdGhlIGZvY3VzZWQgc3RhdGUgYXMgYm90aCBuZWVkIHRvIGJlIHRydWUK KyAgICAgICAgZm9yIHRoZSBjYXJldCB0byBiZSBkcmF3bi4KKworICAgICAgICAqIFdlYlZpZXcu Y3BwOgorICAgICAgICAod3hXZWJWaWV3OjpPblNldEZvY3VzKToKKyAgICAgICAgKHd4V2ViVmll dzo6T25LaWxsRm9jdXMpOgorCiAyMDA4LTEwLTI1ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0 aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIHd4IGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1dl YktpdC93eC9XZWJWaWV3LmNwcCBiL1dlYktpdC93eC9XZWJWaWV3LmNwcAppbmRleCAwYzRjYjY2 Li41NDY1MThmIDEwMDY0NAotLS0gYS9XZWJLaXQvd3gvV2ViVmlldy5jcHAKKysrIGIvV2ViS2l0 L3d4L1dlYlZpZXcuY3BwCkBAIC01NjQsOCArNTY0LDEwIEBAIHZvaWQgd3hXZWJWaWV3OjpPblNl dEZvY3VzKHd4Rm9jdXNFdmVudCYgZXZlbnQpCiAgICAgaWYgKG1fbWFpbkZyYW1lKQogICAgICAg ICBmcmFtZSA9IG1fbWFpbkZyYW1lLT5HZXRGcmFtZSgpOwogICAgICAgICAKLSAgICBpZiAoZnJh bWUpCisgICAgaWYgKGZyYW1lKSB7CisgICAgICAgIG1faW1wbC0+cGFnZS0+Zm9jdXNDb250cm9s bGVyKCktPnNldEFjdGl2ZSh0cnVlKTsKICAgICAgICAgZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRG b2N1c2VkKHRydWUpOworICAgIH0KIAogICAgIGV2ZW50LlNraXAoKTsKIH0KQEAgLTU3Niw5ICs1 NzgsMTAgQEAgdm9pZCB3eFdlYlZpZXc6Ok9uS2lsbEZvY3VzKHd4Rm9jdXNFdmVudCYgZXZlbnQp CiAgICAgaWYgKG1fbWFpbkZyYW1lKQogICAgICAgICBmcmFtZSA9IG1fbWFpbkZyYW1lLT5HZXRG cmFtZSgpOwogICAgICAgICAKLSAgICBpZiAoZnJhbWUpCisgICAgaWYgKGZyYW1lKSB7CisgICAg ICAgIG1faW1wbC0+cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPnNldEFjdGl2ZShmYWxzZSk7CiAg ICAgICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0Rm9jdXNlZChmYWxzZSk7Ci0KKyAgICB9CiAg ICAgZXZlbnQuU2tpcCgpOwogfQogCg==