mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaissance1: #i107215# Focus indicator not lost anymore on mouse-over.

Browse Source
This commit is contained in:
Andre Fischer
2010-06-17 10:00:09 +02:00
parent 5da6de552e
commit e51ec1618d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
View File

@@ -101,6 +101,7 @@ private:
Bitmap maFocusedSelectionBackground;
Bitmap maFocusedBackground;
Bitmap maMouseOverBackground;
Bitmap maMouseOverFocusedBackground;
Bitmap maMouseOverSelectedAndFocusedBackground;
::rtl::OUString msUnhideString;
ButtonBar& mrButtonBar;

12
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
View File

@@ -119,6 +119,7 @@ PageObjectPainter::PageObjectPainter (
maSelectionBackground(),
maFocusedSelectionBackground(),
maMouseOverBackground(),
maMouseOverFocusedBackground(),
msUnhideString(mpTheme->GetString(Theme::String_Unhide)),
mrButtonBar(rSlideSorter.GetView().GetButtonBar())
{
@@ -179,6 +180,7 @@ void PageObjectPainter::NotifyResize (const bool bForce)
maFocusedSelectionBackground.SetEmpty();
maFocusedBackground.SetEmpty();
maMouseOverBackground.SetEmpty();
maMouseOverFocusedBackground.SetEmpty();
maMouseOverSelectedAndFocusedBackground.SetEmpty();
}
@@ -408,13 +410,19 @@ Bitmap& PageObjectPainter::GetBackgroundForState (
true);
case MouseOver | Selected:
case MouseOver | Focused:
case MouseOver:
return GetBackground(
maMouseOverBackground,
Theme::Gradient_MouseOverPage,
rReferenceDevice,
(eState & Focused)!=0);
false);
case MouseOver | Focused:
return GetBackground(
maMouseOverFocusedBackground,
Theme::Gradient_MouseOverPage,
rReferenceDevice,
true);
case Selected | Focused:
return GetBackground(