diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-17 11:56:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-17 12:49:10 +0000 |
| commit | 681294d55b6b4edcdef08982596cb4bcee32e635 (patch) | |
| tree | e156116c560a9d989ef4ad0b8e43d17847e6b811 /sd/source | |
| parent | 7decc4193028f27354556a007a99088c1ea0b32e (diff) | |
gtk3: use native GtkPopover for calc formula prompt, etc
Change-Id: I9aa7e977228780b6273daa03be5e872342414437
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsToolTip.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/viewoverlaymanager.cxx | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 0ec92984bf75..64f7dd0836d8 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -134,7 +134,7 @@ void ToolTip::DoShow() // the preview). Therefore we use a little trick and place the tool // tip at the top of a rectangle that is placed below the preview. aBox.Move(aOffset.X(), aOffset.Y() + aBox.GetHeight() + 3); - mnHelpWindowHandle = Help::ShowTip( + mnHelpWindowHandle = Help::ShowPopover( pWindow, aBox, msCurrentHelpText, @@ -146,7 +146,8 @@ bool ToolTip::Hide() { if (mnHelpWindowHandle>0) { - Help::HideTip(mnHelpWindowHandle); + sd::Window *pWindow (mrSlideSorter.GetContentWindow()); + Help::HidePopover(pWindow, mnHelpWindowHandle); mnHelpWindowHandle = 0; return true; } diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index b97a7d7f6541..426e56a02e79 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -146,7 +146,6 @@ private: int mnHighlightId; Size maImageSize; - sal_uLong mnTip; }; ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) @@ -154,7 +153,6 @@ ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSI , mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) , mnHighlightId( -1 ) , maImageSize( 42, 42 ) -, mnTip( 0 ) { } @@ -165,11 +163,7 @@ ImageButtonHdl::~ImageButtonHdl() void ImageButtonHdl::HideTip() { - if( mnTip ) - { - Help::HideTip( mnTip ); - mnTip = 0; - } + Help::HideBalloonAndQuickHelp(); } void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) @@ -201,7 +195,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) OUString aHelpText( aResId ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); - mnTip = Help::ShowTip( static_cast< vcl::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText ) ; + Help::ShowQuickHelp(static_cast< vcl::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText); } Touch(); } |