Changed the delay on hiding the cursor in fullscreen to 2 seconds (much
better...not sure what I was thinking with 5 seconds before.) I also fixed a few other issues related to this. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19578 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -202,7 +202,9 @@ ShowImageView::ShowImageView(BRect rect, const char *name, uint32 resizingMode,
|
|||||||
#if DELAYED_SCALING
|
#if DELAYED_SCALING
|
||||||
fScalingCountDown = SCALING_DELAY_TIME;
|
fScalingCountDown = SCALING_DELAY_TIME;
|
||||||
#endif
|
#endif
|
||||||
|
fShowingPopUpMenu = false;
|
||||||
fHideCursorCountDown = HIDE_CURSOR_DELAY_TIME;
|
fHideCursorCountDown = HIDE_CURSOR_DELAY_TIME;
|
||||||
|
fIsActiveWin = true;
|
||||||
|
|
||||||
if (settings->Lock()) {
|
if (settings->Lock()) {
|
||||||
fDither = settings->GetBool("Dither", fDither);
|
fDither = settings->GetBool("Dither", fDither);
|
||||||
@@ -296,7 +298,7 @@ void
|
|||||||
ShowImageView::Pulse()
|
ShowImageView::Pulse()
|
||||||
{
|
{
|
||||||
// animate marching ants
|
// animate marching ants
|
||||||
if (HasSelection() && fAnimateSelection && Window()->IsActive()) {
|
if (HasSelection() && fAnimateSelection && fIsActiveWin) {
|
||||||
RotatePatterns();
|
RotatePatterns();
|
||||||
DrawSelectionBox();
|
DrawSelectionBox();
|
||||||
}
|
}
|
||||||
@@ -311,7 +313,7 @@ ShowImageView::Pulse()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Hide cursor in full screen mode
|
// Hide cursor in full screen mode
|
||||||
if (fFullScreen && !fShowingPopUpMenu && fIsActiveWin) {
|
if (fFullScreen && !HasSelection() && !fShowingPopUpMenu && fIsActiveWin) {
|
||||||
if (fHideCursorCountDown <= 0)
|
if (fHideCursorCountDown <= 0)
|
||||||
be_app->ObscureCursor();
|
be_app->ObscureCursor();
|
||||||
else
|
else
|
||||||
@@ -1379,7 +1381,6 @@ ShowImageView::MergeSelection()
|
|||||||
void
|
void
|
||||||
ShowImageView::MouseDown(BPoint position)
|
ShowImageView::MouseDown(BPoint position)
|
||||||
{
|
{
|
||||||
fHideCursorCountDown = HIDE_CURSOR_DELAY_TIME;
|
|
||||||
BPoint point;
|
BPoint point;
|
||||||
uint32 buttons;
|
uint32 buttons;
|
||||||
MakeFocus(true);
|
MakeFocus(true);
|
||||||
@@ -2568,6 +2569,7 @@ ShowImageView::ToggleSlideShow()
|
|||||||
void
|
void
|
||||||
ShowImageView::ExitFullScreen()
|
ShowImageView::ExitFullScreen()
|
||||||
{
|
{
|
||||||
|
be_app->ShowCursor();
|
||||||
BMessenger m(Window());
|
BMessenger m(Window());
|
||||||
m.SendMessage(MSG_EXIT_FULL_SCREEN);
|
m.SendMessage(MSG_EXIT_FULL_SCREEN);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
#define PEN_SIZE 1.0f
|
#define PEN_SIZE 1.0f
|
||||||
|
|
||||||
// the delay time for hiding the cursor in 1/10 seconds (the pulse rate)
|
// the delay time for hiding the cursor in 1/10 seconds (the pulse rate)
|
||||||
#define HIDE_CURSOR_DELAY_TIME 50
|
#define HIDE_CURSOR_DELAY_TIME 20
|
||||||
|
|
||||||
class ShowImageView : public BView {
|
class ShowImageView : public BView {
|
||||||
public:
|
public:
|
||||||
|
|||||||
Reference in New Issue
Block a user