renaissance1: #i107215# Focus indicator not lost anymore on mouse-over.
This commit is contained in:
@@ -101,6 +101,7 @@ private:
|
|||||||
Bitmap maFocusedSelectionBackground;
|
Bitmap maFocusedSelectionBackground;
|
||||||
Bitmap maFocusedBackground;
|
Bitmap maFocusedBackground;
|
||||||
Bitmap maMouseOverBackground;
|
Bitmap maMouseOverBackground;
|
||||||
|
Bitmap maMouseOverFocusedBackground;
|
||||||
Bitmap maMouseOverSelectedAndFocusedBackground;
|
Bitmap maMouseOverSelectedAndFocusedBackground;
|
||||||
::rtl::OUString msUnhideString;
|
::rtl::OUString msUnhideString;
|
||||||
ButtonBar& mrButtonBar;
|
ButtonBar& mrButtonBar;
|
||||||
|
@@ -119,6 +119,7 @@ PageObjectPainter::PageObjectPainter (
|
|||||||
maSelectionBackground(),
|
maSelectionBackground(),
|
||||||
maFocusedSelectionBackground(),
|
maFocusedSelectionBackground(),
|
||||||
maMouseOverBackground(),
|
maMouseOverBackground(),
|
||||||
|
maMouseOverFocusedBackground(),
|
||||||
msUnhideString(mpTheme->GetString(Theme::String_Unhide)),
|
msUnhideString(mpTheme->GetString(Theme::String_Unhide)),
|
||||||
mrButtonBar(rSlideSorter.GetView().GetButtonBar())
|
mrButtonBar(rSlideSorter.GetView().GetButtonBar())
|
||||||
{
|
{
|
||||||
@@ -179,6 +180,7 @@ void PageObjectPainter::NotifyResize (const bool bForce)
|
|||||||
maFocusedSelectionBackground.SetEmpty();
|
maFocusedSelectionBackground.SetEmpty();
|
||||||
maFocusedBackground.SetEmpty();
|
maFocusedBackground.SetEmpty();
|
||||||
maMouseOverBackground.SetEmpty();
|
maMouseOverBackground.SetEmpty();
|
||||||
|
maMouseOverFocusedBackground.SetEmpty();
|
||||||
maMouseOverSelectedAndFocusedBackground.SetEmpty();
|
maMouseOverSelectedAndFocusedBackground.SetEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,13 +410,19 @@ Bitmap& PageObjectPainter::GetBackgroundForState (
|
|||||||
true);
|
true);
|
||||||
|
|
||||||
case MouseOver | Selected:
|
case MouseOver | Selected:
|
||||||
case MouseOver | Focused:
|
|
||||||
case MouseOver:
|
case MouseOver:
|
||||||
return GetBackground(
|
return GetBackground(
|
||||||
maMouseOverBackground,
|
maMouseOverBackground,
|
||||||
Theme::Gradient_MouseOverPage,
|
Theme::Gradient_MouseOverPage,
|
||||||
rReferenceDevice,
|
rReferenceDevice,
|
||||||
(eState & Focused)!=0);
|
false);
|
||||||
|
|
||||||
|
case MouseOver | Focused:
|
||||||
|
return GetBackground(
|
||||||
|
maMouseOverFocusedBackground,
|
||||||
|
Theme::Gradient_MouseOverPage,
|
||||||
|
rReferenceDevice,
|
||||||
|
true);
|
||||||
|
|
||||||
case Selected | Focused:
|
case Selected | Focused:
|
||||||
return GetBackground(
|
return GetBackground(
|
||||||
|
Reference in New Issue
Block a user