Greatly reduce rare animation garbage in wxOwnerDrawnComboBox drop-down animation...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 1c49da3c2be0780643ff0eb4812e70a1293333ed..ae2a06e6ee70db973e46145a6487319b8a135d3b 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -556,6 +556,8 @@ MSW:
 - Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt).
 - Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
   displayed when arrow key is pressed (without Alt).
 - Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt).
 - Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
   displayed when arrow key is pressed (without Alt).

+- In some rare cases wxOwnerDrawnComboBox drop-down animation could display
+  as garbage. This has now been greatly reduced (mcben).

 - Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7.
 
 i18n:
 - Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7.
 
 i18n:

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 996728d4c4f0d4099363d5a8de25c7675e008514..109c74cbd344675235324d35c46037a5afc3a6cb 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -730,6 +730,7 @@ void wxComboCtrl::DoTimerEvent()
 {
     bool stopTimer = false;
 
 {
     bool stopTimer = false;
 

+    wxWindow* win = GetPopupWindow();

     wxWindow* popup = GetPopupControl()->GetControl();
 
     // Popup was hidden before it was fully shown?
     wxWindow* popup = GetPopupControl()->GetControl();
 
     // Popup was hidden before it was fully shown?


@@ -741,7 +742,6 @@ void wxComboCtrl::DoTimerEvent()
     {
         wxLongLong t = ::wxGetLocalTimeMillis();
         const wxRect& rect = m_animRect;
     {
         wxLongLong t = ::wxGetLocalTimeMillis();
         const wxRect& rect = m_animRect;

-        wxWindow* win = GetPopupWindow();

 
         int pos = (int) (t-m_animStart).GetLo();
         if ( pos < COMBOBOX_ANIMATION_DURATION )
 
         int pos = (int) (t-m_animStart).GetLo();
         if ( pos < COMBOBOX_ANIMATION_DURATION )


@@ -759,8 +759,10 @@ void wxComboCtrl::DoTimerEvent()
             }
             else
             {
             }
             else
             {

-                popup->Move( 0, -y );
+                // 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 );
                 win->SetSize( rect.x, rect.y, rect.width, h );

+                popup->Move( 0, -y );

             }
         }
         else
             }
         }
         else


@@ -771,9 +773,13 @@ void wxComboCtrl::DoTimerEvent()
 
     if ( stopTimer )
     {
 
     if ( stopTimer )
     {

-        popup->Move( 0, 0 );

         m_animTimer.Stop();
         DoShowPopup( m_animRect, m_animFlags );
         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
     }
 }
 #endif