Attachment 139495 Details for Bug 114839 – Possible solution

Possible solution

example.txt (text/plain), 2.44 KB, created by Telesto on 2018-02-01 13:23:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Telesto

Created: 2018-02-01 13:23:38 UTC

Size: 2.44 KB

patch

obsolete

>diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
>index 0d93e9e9b2ff..0b9c5432128d 100644
>--- a/vcl/inc/osx/salframe.h
>+++ b/vcl/inc/osx/salframe.h
>@@ -86,7 +86,7 @@ public:
>     CGMutablePathRef                mrClippingPath;         // used for "shaping"
>     std::vector< CGRect >           maClippingRects;
> 
>-    std::list<AquaBlinker*>         maBlinkers;
>+   
> 
>     tools::Rectangle                       maInvalidRect;
> 
>diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
>index d311526c0168..a30eebb90134 100644
>--- a/vcl/osx/salnativewidgets.cxx
>+++ b/vcl/osx/salnativewidgets.cxx
>@@ -44,46 +44,6 @@
> 
> #endif
> 
>-class AquaBlinker : public Timer
>-{
>-    AquaSalFrame*       mpFrame;
>-    tools::Rectangle           maInvalidateRect;
>-
>-    AquaBlinker( AquaSalFrame* pFrame, const tools::Rectangle& rRect )
>-        : Timer( "AquaBlinker" )
>-        , mpFrame( pFrame )
>-        , maInvalidateRect( rRect )
>-    {
>-        mpFrame->maBlinkers.push_back( this );
>-    }
>-
>-public:
>-    static void Blink( AquaSalFrame*, const tools::Rectangle&, int nTimeout = 80 );
>-
>-    virtual void Invoke() override
>-    {
>-        if( AquaSalFrame::isAlive( mpFrame ) && mpFrame->mbShown )
>-        {
>-            mpFrame->maBlinkers.remove( this );
>-            mpFrame->SendPaintEvent( &maInvalidateRect );
>-        }
>-        delete this;
>-    }
>-};
>-
>-void AquaBlinker::Blink( AquaSalFrame* pFrame, const tools::Rectangle& rRect, int nTimeout )
>-{
>-    // prevent repeated paints from triggering themselves all the time
>-    for( std::list< AquaBlinker* >::const_iterator it = pFrame->maBlinkers.begin();
>-         it != pFrame->maBlinkers.end(); ++it )
>-    {
>-        if( (*it)->maInvalidateRect == rRect )
>-            return;
>-    }
>-    AquaBlinker* pNew = new AquaBlinker( pFrame, rRect );
>-    pNew->SetTimeout( nTimeout );
>-    pNew->Start();
>-}
> 
> // Helper returns an HIRect
> 
>@@ -517,12 +477,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
>                 rc.origin.x += FOCUS_RING_WIDTH/2;
>                 rc.size.width -= FOCUS_RING_WIDTH;
> 
>-                if( nState & ControlState::DEFAULT )
>-                {
>-                    AquaBlinker::Blink( mpFrame, buttonRect );
>-                    // show correct animation phase
>-                    aPushInfo.animation.time.current = CFAbsoluteTimeGetCurrent();
>-                }
>+          
>             }
>             else
>                 aPushInfo.kind = kThemeBevelButton;

Actions: View

Attachments on bug 114839: 139495