X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/948f6c6e4c9736df51b28e2548761691f118a9ee..b4a5e7b6f19bcef7449c87d46ab46af1b4aaec6b:/src/html/htmlctrl/webkit/webkit.mm diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index bdffb87a69..588e18696d 100755 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -145,13 +145,14 @@ bool wxWebKitCtrl::Create(wxWindow *parent, SetInitialFrameRect(pos,sizeInstance); #else m_macIsUserPane = false; + m_peer = new wxMacControl(); wxControl::Create(parent, m_windowID, pos, size, style , validator , name); WebInitForCarbon(); - HIWebViewCreate( (HIViewRef*) *m_peer ); + HIWebViewCreate( m_peer->GetControlRefAddr() ); - m_webView = (WebView*) HIWebViewGetWebView( (HIViewRef) *m_peer ); + m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() ); MacPostControlCreate(pos, size); - HIViewSetVisible( (HIViewRef) *m_peer, true ); + HIViewSetVisible( m_peer->GetControlRef(), true ); [m_webView setHidden:false]; #endif @@ -199,17 +200,17 @@ bool wxWebKitCtrl::CanGoForward(){ bool wxWebKitCtrl::GoBack(){ if ( !m_webView ) return false; - - [m_webView goBack]; - return true; + + bool result = [(WebView*)m_webView goBack]; + return result; } bool wxWebKitCtrl::GoForward(){ if ( !m_webView ) return false; - [m_webView goForward]; - return true; + bool result = [(WebView*)m_webView goForward]; + return result; } void wxWebKitCtrl::Reload(){ @@ -235,14 +236,13 @@ bool wxWebKitCtrl::CanGetPageSource(){ } wxString wxWebKitCtrl::GetPageSource(){ - if ( !m_webView ) - return wxT(""); if (CanGetPageSource()){ WebDataSource* dataSource = [[m_webView mainFrame] dataSource]; return wxStringWithNSString( [[dataSource representation] documentSource] ); } + return wxT(""); } void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){ @@ -256,44 +256,65 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){ } void wxWebKitCtrl::OnSize(wxSizeEvent &event){ - // This is a nasty hack because WebKit does not seem to recognize a Tabs control as its parent. - // Therefore, coordinates must be relative to the left-hand side of the screen, rather than - // relative to the Tabs control. + // This is a nasty hack because WebKit seems to lose its position when it is embedded + // in a control that is not itself the content view for a TLW. + wxWindow* parent = GetParent(); - bool inNotebook = false; - int x = 0; - int y = 18; + bool isParentTopLevel = true; + if (!parent->IsTopLevel()) + isParentTopLevel = false; + + int x = GetPosition().x; + // we must take into account the title bar size as well, which is 26 pixels + int y = GetPosition().y + 26; + + NSRect bounds = [m_webView frame]; + wxWindow* tlw = NULL; + while(parent != NULL) { - // keep adding the position until we hit the notebook - if (!inNotebook){ - x += parent->GetPosition().x; - y += parent->GetPosition().y; - } + if (parent->IsTopLevel()) + tlw = parent; + + x += parent->GetPosition().x; + y += parent->GetPosition().y; - if ( parent->GetClassInfo()->GetClassName() == wxT("wxSplitterWindow") ){ - x += 3; + if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){ + //manually account for the size the tabs take up + y += 14; } - if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){ - inNotebook = true; - } + //if ( parent->GetClassInfo()->GetClassName() == wxT("wxSplitterWindow") ){ + // x += 3; + //} + parent = parent->GetParent(); } - if (inNotebook){ + if (!isParentTopLevel){ + if (tlw){ + //x = tlw->GetSize().x - (GetSize().x + x); + y = tlw->GetSize().y - (GetSize().y + y); + } NSRect bounds = [m_webView frame]; bounds.origin.x += x; bounds.origin.y += y; + //leaving debug checks in until I know it works everywhere ;-) + //printf("Added to bounds x=%d, y=%d\n", x, y); [m_webView setFrame:bounds]; } - [m_webView display]; + //printf("Carbon position x=%d, y=%d\n", GetPosition().x, GetPosition().y); + if (IsShown()) + [m_webView display]; event.Skip(); } void wxWebKitCtrl::MacVisibilityChanged(){ - bool isHidden = !IsControlVisible( (HIViewRef)*m_peer); + bool isHidden = !IsControlVisible( m_peer->GetControlRef()); + if (!isHidden) + [m_webView display]; + [m_webView setHidden:isHidden]; }