+ bool stopTimer = false;
+
+ wxWindow* win = GetPopupWindow();
+ wxWindow* popup = GetPopupControl()->GetControl();
+
+ // Popup was hidden before it was fully shown?
+ if ( IsPopupWindowState(Hidden) )
+ {
+ stopTimer = true;
+ }
+ else
+ {
+ wxLongLong t = ::wxGetLocalTimeMillis();
+ const wxRect& rect = m_animRect;
+
+ int pos = (int) (t-m_animStart).GetLo();
+ if ( pos < COMBOBOX_ANIMATION_DURATION )
+ {
+ int height = rect.height;
+ //int h0 = rect.height;
+ int h = (((pos*256)/COMBOBOX_ANIMATION_DURATION)*height)/256;
+ int y = (height - h);
+ if ( y < 0 )
+ y = 0;
+
+ if ( m_animFlags & ShowAbove )
+ {
+ win->SetSize( rect.x, rect.y + height - h, rect.width, h );
+ }
+ else
+ {
+ // Note that apparently Move() should be called after
+ // SetSize() to reduce (or even eliminate) animation garbage
+ win->SetSize( rect.x, rect.y, rect.width, h );
+ popup->Move( 0, -y );
+ }
+ }
+ else
+ {
+ stopTimer = true;
+ }
+ }
+
+ if ( stopTimer )
+ {
+ m_animTimer.Stop();
+ DoShowPopup( m_animRect, m_animFlags );
+ popup->Move( 0, 0 );
+
+ // Do a one final refresh to clean up the rare cases of animation
+ // garbage
+ win->Refresh();
+ }
+}
+#endif
+
+#if wxUSE_COMBOCTRL_POPUP_ANIMATION
+bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
+{
+ if ( GetUserPreferencesMask() & wxMSW_DESKTOP_USERPREFERENCESMASK_COMBOBOXANIM )
+ {
+ m_animStart = ::wxGetLocalTimeMillis();
+ m_animRect = rect;
+ m_animFlags = flags;
+
+ wxWindow* win = GetPopupWindow();
+ win->SetSize( rect.x, rect.y, rect.width, 0 );
+ win->Show();
+
+ m_animTimer.SetOwner( this, wxID_ANY );
+ m_animTimer.Start( COMBOBOX_ANIMATION_RESOLUTION, wxTIMER_CONTINUOUS );
+
+ DoTimerEvent();
+
+ return false;
+ }
+
+ return true;
+}
+#endif
+
+wxCoord wxComboCtrl::GetNativeTextIndent() const
+{
+#if wxUSE_UXTHEME
projects / wxWidgets.git / blobdiff