X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19cf18752e684b26b4a44a4dff1ca364e21ee074..298c25c3a5b9d5d6b92310a54f860cd48627888b:/src/generic/scrlwing.cpp?ds=sidebyside diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 0476ed31dc..ec5d404f50 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -25,10 +25,6 @@ #pragma hdrstop #endif -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - #include "wx/scrolwin.h" #ifndef WX_PRECOMP @@ -442,6 +438,12 @@ void wxScrollHelper::DeleteEvtHandler() } } +void wxScrollHelper::ResetDrawnFlag() +{ + wxCHECK_RET( m_handler, "invalid use of ResetDrawnFlag - no handler?" ); + m_handler->ResetDrawnFlag(); +} + void wxScrollHelper::DoSetTargetWindow(wxWindow *target) { m_targetWindow = target; @@ -1339,21 +1341,69 @@ void wxScrollHelper::HandleOnChildFocus(wxChildFocusEvent& event) if ( win == m_targetWindow ) return; // nothing to do - while ( win->GetParent() != m_targetWindow ) +#ifdef __WXMAC__ + if (wxDynamicCast(win, wxScrollBar)) + return; +#endif + + // Fixing ticket: http://trac.wxwidgets.org/ticket/9563 + // When a child inside a wxControlContainer receives a focus, the + // wxControlContainer generates an artificial wxChildFocusEvent for + // itself, telling its parent that 'it' received the focus. The effect is + // that this->HandleOnChildFocus is called twice, first with the + // artificial wxChildFocusEvent and then with the original event. We need + // to ignore the artificial event here or otherwise HandleOnChildFocus + // would first scroll the target window to make the entire + // wxControlContainer visible and immediately afterwards scroll the target + // window again to make the child widget visible. This leads to ugly + // flickering when using nested wxPanels/wxScrolledWindows. + // + // Ignore this event if 'win' is derived from wxControlContainer AND its + // parent is the m_targetWindow AND 'win' is not actually reciving the + // focus (win != FindFocus). TODO: This affects all wxControlContainer + // objects, but wxControlContainer is not part of the wxWidgets RTTI and + // so wxDynamicCast(win, wxControlContainer) does not compile. Find a way + // to determine if 'win' derives from wxControlContainer. Until then, + // testing if 'win' derives from wxPanel will probably get >90% of all + // cases. + + wxWindow *actual_focus=wxWindow::FindFocus(); + if (win != actual_focus && + wxDynamicCast(win, wxPanel) != 0 && + win->GetParent() == m_targetWindow) + // if win is a wxPanel and receives the focus, it should not be + // scrolled into view + return; + + wxSize view(m_targetWindow->GetClientSize()); + + // For composite controls such as wxComboCtrl we should try to fit the + // entire control inside the visible area of the target window, not just + // the focused child of the control. Otherwise we'd make only the textctrl + // part of a wxComboCtrl visible and the button would still be outside the + // scrolled area. But do so only if the parent fits *entirely* inside the + // scrolled window. In other situations, such as nested wxPanel or + // wxScrolledWindows, the parent might be way to big to fit inside the + // scrolled window. If that is the case, then make only the focused window + // visible + if ( win->GetParent() != m_targetWindow) { - win = win->GetParent(); - if ( !win ) - return; // event is not from a child of the target window + wxWindow *parent=win->GetParent(); + wxSize parent_size=parent->GetSize(); + if (parent_size.GetWidth() <= view.GetWidth() && + parent_size.GetHeight() <= view.GetHeight()) + // make the immediate parent visible instead of the focused control + win=parent; } // if the child is not fully visible, try to scroll it into view: int stepx, stepy; GetScrollPixelsPerUnit(&stepx, &stepy); - // NB: we don't call CalcScrolledPosition() on win->GetPosition() here, - // because children' positions are already scrolled - wxRect winrect(win->GetPosition(), win->GetSize()); - wxSize view(m_targetWindow->GetClientSize()); + // 'win' position coordinates are relative to it's parent + // convert them so that they are relative to the m_targetWindow viewing area + wxRect winrect(m_targetWindow->ScreenToClient(win->GetScreenPosition()), + win->GetSize()); int startx, starty; GetViewStart(&startx, &starty); @@ -1402,52 +1452,12 @@ void wxScrollHelper::HandleOnChildFocus(wxChildFocusEvent& event) } // ---------------------------------------------------------------------------- -// wxScrolledWindow implementation +// wxScrolled and wxScrolledWindow implementation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel) - -BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel) - EVT_PAINT(wxScrolledWindow::OnPaint) -END_EVENT_TABLE() - -bool wxScrolledWindow::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - m_targetWindow = this; -#ifdef __WXMAC__ - MacSetClipChildren( true ) ; -#endif - - // by default, we're scrollable in both directions (but if one of the - // styles is specified explicitly, we shouldn't add the other one - // automatically) - if ( !(style & (wxHSCROLL | wxVSCROLL)) ) - style |= wxHSCROLL | wxVSCROLL; - - bool ok = wxPanel::Create(parent, id, pos, size, style, name); - - return ok; -} - -wxScrolledWindow::~wxScrolledWindow() -{ -} - -void wxScrolledWindow::OnPaint(wxPaintEvent& event) -{ - // the user code didn't really draw the window if we got here, so set this - // flag to try to call OnDraw() later - m_handler->ResetDrawnFlag(); - - event.Skip(); -} - -wxSize wxScrolledWindow::DoGetBestSize() const +wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win, + const wxScrollHelperNative *helper, + const wxSize& origBest) { // NB: We don't do this in WX_FORWARD_TO_SCROLL_HELPER, because not // all scrollable windows should behave like this, only those that @@ -1455,15 +1465,15 @@ wxSize wxScrolledWindow::DoGetBestSize() const // (i.e., wxScrolledWindow) and other some scrollable windows may // have different DoGetBestSize() implementation (e.g. wxTreeCtrl). - wxSize best = wxPanel::DoGetBestSize(); + wxSize best = origBest; - if ( GetAutoLayout() ) + if ( win->GetAutoLayout() ) { // Only use the content to set the window size in the direction // where there's no scrolling; otherwise we're going to get a huge // window in the direction in which scrolling is enabled int ppuX, ppuY; - GetScrollPixelsPerUnit(&ppuX, &ppuY); + helper->GetScrollPixelsPerUnit(&ppuX, &ppuY); // NB: This code used to use *current* size if min size wasn't // specified, presumably to get some reasonable (i.e., larger than @@ -1475,7 +1485,7 @@ wxSize wxScrolledWindow::DoGetBestSize() const // // See also http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=45864 - wxSize minSize = GetMinSize(); + wxSize minSize = win->GetMinSize(); if ( ppuX > 0 ) best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); @@ -1488,12 +1498,8 @@ wxSize wxScrolledWindow::DoGetBestSize() const } #ifdef __WXMSW__ -WXLRESULT wxScrolledWindow::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) +WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXUINT nMsg, WXLRESULT rc) { - WXLRESULT rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam); - #ifndef __WXWINCE__ // we need to process arrows ourselves for scrolling if ( nMsg == WM_GETDLGCODE ) @@ -1501,8 +1507,10 @@ WXLRESULT wxScrolledWindow::MSWWindowProc(WXUINT nMsg, rc |= DLGC_WANTARROWS; } #endif - return rc; } - #endif // __WXMSW__ + +// NB: skipping wxScrolled in wxRTTI information because being a templte, +// it doesn't and can't implement wxRTTI support +IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)