#include "wx/combobox.h"
#ifndef WX_PRECOMP
+ #include "wx/app.h"
#include "wx/log.h"
#include "wx/dcclient.h"
#include "wx/settings.h"
// constants
// ----------------------------------------------------------------------------
-// Milliseconds to wait for two mouse-ups after focus inorder
-// to trigger a double-click.
-#define DOUBLE_CLICK_CONVERSION_TRESHOLD 500
-
#define DEFAULT_DROPBUTTON_WIDTH 19
#define BMP_BUTTON_MARGIN 4
// native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
#define TEXTCTRL_TEXT_CENTERED 0 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 0 // No focus ring on wxMSW
//#undef wxUSE_POPUPWIN
//#define wxUSE_POPUPWIN 0
// native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window.
#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 0 // No focus ring on wxGTK
#elif defined(__WXMAC__)
// native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 3 // Reserve room for the textctrl's focus ring to display
+
+#undef DEFAULT_DROPBUTTON_WIDTH
+#define DEFAULT_DROPBUTTON_WIDTH 22
+#undef COMBO_MARGIN
+#define COMBO_MARGIN FOCUS_RING
#else
// native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
#define TEXTCTRL_TEXT_CENTERED 1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING 0
#endif
style)
#endif
{
+ m_inShow = 0;
}
#if USES_WXPOPUPTRANSIENTWINDOW
+ virtual bool Show( bool show );
virtual bool ProcessLeftDown(wxMouseEvent& event);
+protected:
virtual void OnDismiss();
#endif
+private:
+ wxByte m_inShow;
};
#if USES_WXPOPUPTRANSIENTWINDOW
-bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event )
+bool wxComboPopupWindow::Show( bool show )
+{
+ // Guard against recursion
+ if ( m_inShow )
+ return wxComboPopupWindowBase::Show(show);
+
+ m_inShow++;
+
+ wxASSERT( IsKindOf(CLASSINFO(wxPopupTransientWindow)) );
+
+ wxPopupTransientWindow* ptw = (wxPopupTransientWindow*) this;
+
+ if ( show != ptw->IsShown() )
+ {
+ if ( show )
+ // We used to do wxPopupTransientWindow::Popup here,
+ // but this would hide normal Show, which we are
+ // also going to need.
+ ptw->Show();
+ else
+ ptw->Dismiss();
+ }
+
+ m_inShow--;
+
+ return true;
+}
+
+bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
{
- return wxComboPopupWindowBase::ProcessLeftDown(event);
+ return wxPopupTransientWindow::ProcessLeftDown(event);
}
// First thing that happens when a transient popup closes is that this method gets called.
m_combo = parent;
}
+ void OnSizeEvent( wxSizeEvent& event );
void OnKeyEvent(wxKeyEvent& event);
#if USES_WXDIALOG
void OnActivate( wxActivateEvent& event );
#if USES_WXDIALOG
EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
#endif
+ EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
END_EVENT_TABLE()
+void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) )
+{
+ // Block the event so that the popup control does not get auto-resized.
+}
+
void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event )
{
// Relay keyboard event to the main child controls
BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
+ EVT_KILL_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
END_EVENT_TABLE()
{
// FIXME: This code does run when control is clicked,
// yet on Windows it doesn't select all the text.
- if ( !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
+ if ( event.GetEventType() == wxEVT_SET_FOCUS &&
+ !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
{
if ( m_combo->GetTextCtrl() )
m_combo->GetTextCtrl()->SelectAll();
// wxEVT_SET_FOCUSes (since m_text->SetFocus is called
// from combo's focus event handler), they should be quite
// harmless.
- wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
+ wxFocusEvent evt2(event.GetEventType(),m_combo->GetId());
evt2.SetEventObject(m_combo);
m_combo->GetEventHandler()->ProcessEvent(evt2);
wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
int evtType = event.GetEventType();
bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y;
+ bool relayToButton = false;
+
+ event.Skip();
if ( evtType == wxEVT_MOTION ||
evtType == wxEVT_LEFT_DOWN ||
evtType == wxEVT_RIGHT_DOWN )
{
// Block motion and click events outside the popup
- if ( !isInside )
+ if ( !isInside || !m_combo->IsPopupShown() )
{
event.Skip(false);
- return;
}
}
else if ( evtType == wxEVT_LEFT_UP )
{
- // Don't let left-down events in if outside
- if ( evtType == wxEVT_LEFT_DOWN )
+ if ( !m_combo->IsPopupShown() )
{
- if ( !isInside )
- return;
+ event.Skip(false);
+ relayToButton = true;
}
-
- if ( !m_beenInside )
+ else if ( !m_beenInside )
{
if ( isInside )
{
}
else
{
- //
- // Some mouse events to popup that happen outside it, before cursor
- // has been inside the popu, need to be ignored by it but relayed to
- // the dropbutton.
- //
- wxWindow* btn = m_combo->GetButton();
- if ( btn )
- btn->GetEventHandler()->AddPendingEvent(event);
- else
- m_combo->GetEventHandler()->AddPendingEvent(event);
-
- return;
+ relayToButton = true;
}
-
- event.Skip();
}
}
- event.Skip();
+ if ( relayToButton )
+ {
+ //
+ // Some mouse events to popup that happen outside it, before cursor
+ // has been inside the popup, need to be ignored by it but relayed to
+ // the dropbutton.
+ //
+ wxWindow* eventSink = m_combo;
+ wxWindow* btn = m_combo->GetButton();
+ if ( btn )
+ eventSink = btn;
+
+ eventSink->GetEventHandler()->ProcessEvent(event);
+ }
}
+// ----------------------------------------------------------------------------
+// wxComboCtrlTextCtrl
+// ----------------------------------------------------------------------------
+
+class wxComboCtrlTextCtrl : public wxTextCtrl
+{
+public:
+ wxComboCtrlTextCtrl() : wxTextCtrl() { }
+ virtual ~wxComboCtrlTextCtrl() { }
+
+ virtual wxWindow *GetMainWindowOfCompositeControl()
+ {
+ wxComboCtrl* combo = (wxComboCtrl*) GetParent();
+
+ // Returning this instead of just 'parent' lets FindFocus work
+ // correctly even when parent control is a child of a composite
+ // generic control (as is case with wxGenericDatePickerCtrl).
+ return combo->GetMainWindowOfCompositeControl();
+ }
+};
+
// ----------------------------------------------------------------------------
// wxComboCtrlBase
// ----------------------------------------------------------------------------
EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
+ EVT_IDLE(wxComboCtrlBase::OnIdleEvent)
//EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
{
m_winPopup = (wxWindow *)NULL;
m_popup = (wxWindow *)NULL;
- m_isPopupShown = false;
+ m_popupWinState = Hidden;
m_btn = (wxWindow*) NULL;
m_text = (wxTextCtrl*) NULL;
m_popupInterface = (wxComboPopup*) NULL;
m_toplevEvtHandler = (wxEvtHandler*) NULL;
#endif
+ m_mainCtrlWnd = this;
+
m_heightPopup = -1;
m_widthMinPopup = -1;
m_anchorSide = 0;
m_absIndent = -1;
m_iFlags = 0;
m_timeCanAcceptClick = 0;
+
+ m_resetFocus = false;
}
bool wxComboCtrlBase::Create(wxWindow *parent,
else
m_ignoreEvtText = 0;
- m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
- wxDefaultPosition, wxDefaultSize,
- style, validator);
-
- // This is required for some platforms (GTK+ atleast)
- m_text->SetSizeHints(2,4);
+ m_text = new wxComboCtrlTextCtrl();
+ m_text->Create(this, wxID_ANY, m_valueString,
+ wxDefaultPosition, wxSize(10,-1),
+ style, validator);
}
}
void wxComboCtrlBase::OnThemeChange()
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ // Leave the default bg on the Mac so the area used by the focus ring will
+ // be the correct colour and themed brush. Instead we'll use
+ // wxSYS_COLOUR_WINDOW in the EVT_PAINT handler as needed.
+#ifndef __WXMAC__
+ SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
}
wxComboCtrlBase::~wxComboCtrlBase()
m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
btnBorder = 0;
}
+ else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) &&
+ m_btnSpacingX == 0 && !m_bmpNormal.Ok() )
+ {
+ m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
+ btnBorder = 0;
+ }
else
{
m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
{
int newY = butHeight+(customBorder*2);
SetClientSize(wxDefaultCoord,newY);
+ if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
+ m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+ else
+ m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+
sz.y = newY;
}
}
m_btnSize.y = butHeight;
m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder );
- m_btnArea.y = btnBorder;
+ m_btnArea.y = btnBorder + FOCUS_RING;
m_btnArea.width = butAreaWid;
- m_btnArea.height = sz.y - (btnBorder*2);
+ m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2);
- m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder;
- m_tcArea.y = customBorder;
- m_tcArea.width = sz.x - butAreaWid - (customBorder*2);
- m_tcArea.height = sz.y - (customBorder*2);
+ m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder + FOCUS_RING;
+ m_tcArea.y = customBorder + FOCUS_RING;
+ m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - (FOCUS_RING*2);
+ m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2);
/*
if ( m_text )
if ( !m_text )
return;
+#if !TEXTCTRL_TEXT_CENTERED
+
wxSize sz = GetClientSize();
- int customBorder = m_widthCustomBorder;
-#if !TEXTCTRL_TEXT_CENTERED
+ int customBorder = m_widthCustomBorder;
if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
{
// Centre textctrl
}
}
else
-#else
+#else // TEXTCTRL_TEXT_CENTERED
wxUnusedVar(textCtrlXAdjust);
wxUnusedVar(textCtrlYAdjust);
-#endif
+#endif // !TEXTCTRL_TEXT_CENTERED/TEXTCTRL_TEXT_CENTERED
{
// If it has border, have textctrl will the entire text field.
m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
- customBorder,
- sz.x - m_btnArea.width - m_widthCustomPaint - customBorder,
- sz.y-(customBorder*2) );
+ m_tcArea.y,
+ m_tcArea.width - m_widthCustomPaint,
+ m_tcArea.height );
}
}
fhei += 1;
#endif
- wxSize ret(sizeText.x + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH,
- fhei);
+#ifdef __WXMAC__
+ // these are the numbers from the HIG:
+ switch ( m_windowVariant )
+ {
+ case wxWINDOW_VARIANT_NORMAL:
+ default :
+ fhei = 22;
+ break;
+ case wxWINDOW_VARIANT_SMALL:
+ fhei = 19;
+ break;
+ case wxWINDOW_VARIANT_MINI:
+ fhei = 15;
+ break;
+ }
+#endif
+
+ fhei += 2 * FOCUS_RING;
+ int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
+ wxSize ret(width, fhei);
CacheBestSize(ret);
return ret;
}
}
#endif // wxUSE_TOOLTIPS
+#if wxUSE_VALIDATORS
+void wxComboCtrlBase::SetValidator(const wxValidator& validator)
+{
+ wxTextCtrl* textCtrl = GetTextCtrl();
+
+ if ( textCtrl )
+ textCtrl->SetValidator( validator );
+}
+
+wxValidator* wxComboCtrlBase::GetValidator()
+{
+ wxTextCtrl* textCtrl = GetTextCtrl();
+
+ if ( textCtrl )
+ return textCtrl->GetValidator();
+
+ return wxControl::GetValidator();
+}
+#endif // wxUSE_VALIDATORS
+
// ----------------------------------------------------------------------------
// painting
// ----------------------------------------------------------------------------
{
wxSize sz = GetClientSize();
bool isEnabled;
- bool isFocused; // also selected
+ bool doDrawFocusRect; // also selected
// For smaller size control (and for disabled background) use less spacing
int focusSpacingX;
{
// Drawing control
isEnabled = IsEnabled();
- isFocused = ShouldDrawFocus();
+ doDrawFocusRect = ShouldDrawFocus() & !(m_iFlags & wxCC_FULL_BUTTON);
// Windows-style: for smaller size control (and for disabled background) use less spacing
focusSpacingX = isEnabled ? 2 : 1;
{
// Drawing a list item
isEnabled = true; // they are never disabled
- isFocused = flags & wxCONTROL_SELECTED ? true : false;
+ doDrawFocusRect = flags & wxCONTROL_SELECTED ? true : false;
focusSpacingX = 0;
focusSpacingY = 0;
selRect.width -= wcp + (focusSpacingX*2);
wxColour bgCol;
+ bool doDrawSelRect = true;
if ( isEnabled )
{
// If popup is hidden and this control is focused,
// then draw the focus-indicator (selbgcolor background etc.).
- if ( isFocused )
+ if ( doDrawFocusRect )
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
else
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
+#ifndef __WXMAC__ // see note in OnThemeChange
+ doDrawSelRect = false;
bgCol = GetBackgroundColour();
+#else
+ bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
}
}
else
{
dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
+#ifndef __WXMAC__ // see note in OnThemeChange
bgCol = GetBackgroundColour();
+#else
+ bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
}
dc.SetBrush( bgCol );
- dc.SetPen( bgCol );
- dc.DrawRectangle( selRect );
+ if ( doDrawSelRect )
+ {
+ dc.SetPen( bgCol );
+ dc.DrawRectangle( selRect );
+ }
// Don't clip exactly to the selection rectangle so we can draw
// to the non-selected area in front of it.
}
#endif
-void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
+void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
{
int drawState = m_btnState;
-#ifdef __WXGTK__
- if ( m_isPopupShown )
+ if ( (m_iFlags & wxCC_BUTTON_STAYS_DOWN) &&
+ GetPopupWindowState() >= Animating )
drawState |= wxCONTROL_PRESSED;
-#endif
wxRect drawRect(rect.x+m_btnSpacingX,
rect.y+((rect.height-m_btnSize.y)/2),
if ( !m_bmpNormal.Ok() )
{
+ if ( flags & Button_BitmapOnly )
+ return;
+
// Need to clear button background even if m_btn is present
- if ( paintBg )
+ if ( flags & Button_PaintBackground )
{
wxColour bgCol;
{
// If using blank button background, we need to clear its background
// with button face colour instead of colour for rest of the control.
- if ( paintBg )
+ if ( flags & Button_PaintBackground )
{
wxColour bgCol = GetParent()->GetBackgroundColour(); //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
//wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
dc.DrawRectangle(rect);
}
- wxRendererNative::Get().DrawPushButton(this,
- dc,
- drawRect,
- drawState);
-
+ if ( !(flags & Button_BitmapOnly) )
+ {
+ wxRendererNative::Get().DrawPushButton(this,
+ dc,
+ drawRect,
+ drawState);
+ }
}
else
{
// Need to clear button background even if m_btn is present
// (assume non-button background was cleared just before this call so brushes are good)
- if ( paintBg )
+ if ( flags & Button_PaintBackground )
dc.DrawRectangle(rect);
}
// call if cursor is on button area or mouse is captured for the button
bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
- int flags )
+ int flags )
{
int type = event.GetEventType();
if ( type == wxEVT_MOTION )
{
- if ( flags & wxCC_MF_ON_BUTTON )
+ if ( (flags & wxCC_MF_ON_BUTTON) &&
+ IsPopupWindowState(Hidden) )
{
if ( !(m_btnState & wxCONTROL_CURRENT) )
{
Refresh();
}
}
- else if ( type == wxEVT_LEFT_DOWN )
+ else if ( type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK )
{
if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
{
m_btnState &= ~(wxCONTROL_CURRENT);
// Mouse hover ends
- if ( !m_isPopupShown )
+ if ( IsPopupWindowState(Hidden) )
{
m_btnState &= ~(wxCONTROL_PRESSED);
Refresh();
else
return false;
+ // Never have 'hot' state when popup is being shown
+ // (this is mostly needed because of the animation).
+ if ( !IsPopupWindowState(Hidden) )
+ m_btnState &= ~wxCONTROL_CURRENT;
+
return true;
}
#if USES_WXPOPUPWINDOW || USES_WXDIALOG
if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
{
- if ( m_isPopupShown &&
+ if ( IsPopupWindowState(Visible) &&
( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
{
HidePopup();
}
#endif
- // Filter out clicks on button immediately after popup dismiss (Windows like behaviour)
+ // Filter out clicks on button immediately after popup dismiss
if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
{
event.SetEventType(0);
if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) &&
(m_windowStyle & wxCB_READONLY) )
{
- if ( m_isPopupShown )
+ if ( GetPopupWindowState() >= Animating )
{
#if USES_WXPOPUPWINDOW
// Click here always hides the popup.
}
}
else
- if ( m_isPopupShown )
+ if ( IsPopupShown() )
{
// relay (some) mouse events to the popup
if ( evtType == wxEVT_MOUSEWHEEL )
if ( keycode == WXK_TAB )
{
wxNavigationKeyEvent evt;
+
+ wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
+
evt.SetFlags(wxNavigationKeyEvent::FromTab|
(!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
: wxNavigationKeyEvent::IsBackward));
- evt.SetEventObject(this);
- GetParent()->GetEventHandler()->AddPendingEvent(evt);
+ evt.SetEventObject(mainCtrl);
+ evt.SetCurrentFocus(mainCtrl);
+ mainCtrl->GetParent()->GetEventHandler()->AddPendingEvent(evt);
return;
}
{
if ( event.GetEventType() == wxEVT_SET_FOCUS )
{
- if ( m_text && m_text != ::wxWindow::FindFocus() )
- m_text->SetFocus();
+ wxWindow* tc = GetTextCtrl();
+ if ( tc && tc != DoFindFocus() )
+#ifdef __WXMAC__
+ m_resetFocus = true;
+#else
+ {
+ tc->SetFocus();
+ }
+#endif
}
Refresh();
}
+void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
+{
+ if ( m_resetFocus )
+ {
+ m_resetFocus = false;
+ wxWindow* tc = GetTextCtrl();
+ if ( tc )
+ tc->SetFocus();
+ }
+}
+
void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
OnThemeChange();
m_popupWinType = SECONDARY_POPUP_TYPE;
}
else
-#endif
+#endif // wxComboPopupWindowBase2
{
m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
m_popupWinType = PRIMARY_POPUP_TYPE;
void wxComboCtrlBase::ShowPopup()
{
EnsurePopupControl();
- wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );
+ wxCHECK_RET( !IsPopupWindowState(Visible), wxT("popup window already shown") );
+
+ if ( IsPopupWindowState(Animating) )
+ return;
SetFocus();
popup = m_popup;
}
+ winPopup->Enable();
+
wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
int leftX = scrPos.x - m_extLeft;
+
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ leftX -= ctrlSz.x;
+
int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
// If there is not enough horizontal space, anchor on the other side.
else
popupX = 0;
+ int showFlags = CanDeferShow;
+
if ( spaceBelow < szp.y )
{
popupY = scrPos.y - szp.y;
+ showFlags |= ShowAbove;
}
- // Move to position
- //wxLogDebug(wxT("popup scheduled position1: %i,%i"),ptp.x,ptp.y);
- //wxLogDebug(wxT("popup position1: %i,%i"),winPopup->GetPosition().x,winPopup->GetPosition().y);
-
- // Some platforms (GTK) may need these two to be separate
- winPopup->SetSize( szp.x, szp.y );
- winPopup->Move( popupX, popupY );
-
- //wxLogDebug(wxT("popup position2: %i,%i"),winPopup->GetPosition().x,winPopup->GetPosition().y);
+#if INSTALL_TOPLEV_HANDLER
+ // Put top level window event handler into place
+ if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+ {
+ if ( !m_toplevEvtHandler )
+ m_toplevEvtHandler = new wxComboFrameEventHandler(this);
- m_popup = popup;
+ wxWindow* toplev = ::wxGetTopLevelParent( this );
+ wxASSERT( toplev );
+ ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
+ toplev->PushEventHandler( m_toplevEvtHandler );
+ }
+#endif
// Set string selection (must be this way instead of SetStringSelection)
if ( m_text )
}
// This must be after SetStringValue
- m_isPopupShown = true;
+ m_popupWinState = Animating;
+
+ wxRect popupWinRect( popupX, popupY, szp.x, szp.y );
+
+ m_popup = popup;
+ if ( (m_iFlags & wxCC_IFLAG_DISABLE_POPUP_ANIM) ||
+ AnimateShow( popupWinRect, showFlags ) )
+ {
+ DoShowPopup( popupWinRect, showFlags );
+ }
+}
+
+bool wxComboCtrlBase::AnimateShow( const wxRect& WXUNUSED(rect), int WXUNUSED(flags) )
+{
+ return true;
+}
+
+void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
+{
+ wxWindow* winPopup = m_winPopup;
+
+ if ( IsPopupWindowState(Animating) )
+ {
+ // Make sure the popup window is shown in the right position.
+ // Should not matter even if animation already did this.
+
+ // Some platforms (GTK) may like SetSize and Move to be separate
+ // (though the bug was probably fixed).
+ winPopup->SetSize( rect );
- // Show it
#if USES_WXPOPUPTRANSIENTWINDOW
- if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
- ((wxPopupTransientWindow*)winPopup)->Popup(popup);
- else
+ if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+ ((wxPopupTransientWindow*)winPopup)->Popup(m_popup);
+ else
#endif
- winPopup->Show();
+ winPopup->Show();
-#if INSTALL_TOPLEV_HANDLER
- // Put top level window event handler into place
- if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+ m_popupWinState = Visible;
+ }
+ else if ( IsPopupWindowState(Hidden) )
{
- if ( !m_toplevEvtHandler )
- m_toplevEvtHandler = new wxComboFrameEventHandler(this);
+ // Animation was aborted
- wxWindow* toplev = ::wxGetTopLevelParent( this );
- wxASSERT( toplev );
- ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
- toplev->PushEventHandler( m_toplevEvtHandler );
+ wxASSERT( !winPopup->IsShown() );
+
+ m_popupWinState = Hidden;
}
-#endif
+ Refresh();
}
void wxComboCtrlBase::OnPopupDismiss()
-{
+{
// Just in case, avoid double dismiss
- if ( !m_isPopupShown )
+ if ( IsPopupWindowState(Hidden) )
return;
- // NB: Focus setting is really funny, atleast on wxMSW. First of all,
- // we need to have SetFocus at the end. Otherwise wxTextCtrl may
- // freeze until focus goes somewhere else. Second, wxTreeCtrl as
- // popup, when dismissing, "steals" focus back to itself unless
- // SetFocus is called also here, exactly before m_isPopupShown
- // is set to false. Which is truly weird since SetFocus is just
- // wxWindowMSW method and does not call event handler or anything like
- // that (ie. does not care about m_isPopupShown).
-
- SetFocus();
+ // This must be set before focus - otherwise there will be recursive
+ // OnPopupDismisses.
+ m_popupWinState = Hidden;
- // This should preferably be set before focus.
- m_isPopupShown = false;
+ //SetFocus();
+ m_winPopup->Disable();
// Inform popup control itself
m_popupInterface->OnDismiss();
}
#endif
- m_timeCanAcceptClick = ::wxGetLocalTimeMillis() + 150;
+ m_timeCanAcceptClick = ::wxGetLocalTimeMillis();
+
+ if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+ m_timeCanAcceptClick += 150;
// If cursor not on dropdown button, then clear its state
// (technically not required by all ports, but do it for all just in case)
void wxComboCtrlBase::HidePopup()
{
// Should be able to call this without popup interface
- //wxCHECK_RET( m_popupInterface, _T("no popup interface") );
- if ( !m_isPopupShown )
+ if ( IsPopupWindowState(Hidden) )
return;
// transfer value and show it in textctrl, if any
- SetValue( m_popupInterface->GetStringValue() );
+ if ( !IsPopupWindowState(Animating) )
+ SetValue( m_popupInterface->GetStringValue() );
-#if USES_WXPOPUPTRANSIENTWINDOW
- if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
- ((wxPopupTransientWindow*)m_winPopup)->Dismiss();
- else
-#endif
- m_winPopup->Hide();
+ m_winPopup->Hide();
OnPopupDismiss();
}
m_text->SelectAll();
}
- m_valueString = value;
-
- Refresh();
-
// Since wxComboPopup may want to paint the combo as well, we need
// to set the string value here (as well as sometimes in ShowPopup).
- if ( m_valueString != value && m_popupInterface )
+ if ( m_valueString != value )
{
- m_popupInterface->SetStringValue(value);
+ m_valueString = value;
+
+ EnsurePopupControl();
+
+ if (m_popupInterface)
+ m_popupInterface->SetStringValue(value);
}
+
+ Refresh();
}
void wxComboCtrlBase::SetValue(const wxString& value)
projects / wxWidgets.git / blobdiff