i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The feel of a BWindowScreen should actually be kWindowScreenFeel. This makes

Browse Source 
the Deskbar behave, and not appear in front of those. However, if auto-raise
  is turned on, the mouse cursor is shown, so it seems to get activated anyway.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32535 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-08-20 09:02:55 +00:00
parent 840cdc9efc
commit acc71e7c7c
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/game/WindowScreen.cpp
+21 -21
View File
@@ -187,9 +187,9 @@ set_mouse_position(int32 x, int32 y)
BWindowScreen::BWindowScreen(const char *title, uint32 space, BWindowScreen::BWindowScreen(const char *title, uint32 space,
status_t *error, bool debug_enable) status_t *error, bool debug_enable)
: BWindow(BScreen().Frame(), title, B_TITLED_WINDOW, : BWindow(BScreen().Frame(), title, B_NO_BORDER_WINDOW_LOOK,
kWindowScreenFlag | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE kWindowScreenFeel, kWindowScreenFlag | B_NOT_MINIMIZABLE
| B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE, | B_NOT_CLOSABLE | B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
CALLED(); CALLED();
@@ -205,9 +205,9 @@ BWindowScreen::BWindowScreen(const char *title, uint32 space,
BWindowScreen::BWindowScreen(const char *title, uint32 space, BWindowScreen::BWindowScreen(const char *title, uint32 space,
uint32 attributes, status_t *error) uint32 attributes, status_t *error)
: BWindow(BScreen().Frame(), title, B_TITLED_WINDOW, : BWindow(BScreen().Frame(), title, B_NO_BORDER_WINDOW_LOOK,
kWindowScreenFlag | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE kWindowScreenFeel, kWindowScreenFlag | B_NOT_MINIMIZABLE
| B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE, | B_NOT_CLOSABLE | B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
CALLED(); CALLED();
@@ -322,7 +322,7 @@ BWindowScreen::SetColorList(rgb_color *list, int32 firstIndex, int32 lastIndex)
if (!Lock()) if (!Lock())
return; return;
if (!fActivateState) { if (!fActivateState) {
// If we aren't active, we just change our local palette // If we aren't active, we just change our local palette
for (int32 x = firstIndex; x <= lastIndex; x++) { for (int32 x = firstIndex; x <= lastIndex; x++) {
@@ -336,12 +336,12 @@ BWindowScreen::SetColorList(rgb_color *list, int32 firstIndex, int32 lastIndex)
for (int32 x = firstIndex; x <= lastIndex; x++) { for (int32 x = firstIndex; x <= lastIndex; x++) {
fPalette[x] = list[x - firstIndex]; fPalette[x] = list[x - firstIndex];
// update our local palette as well // update our local palette as well
colors[j++] = fPalette[x].red; colors[j++] = fPalette[x].red;
colors[j++] = fPalette[x].green; colors[j++] = fPalette[x].green;
colors[j++] = fPalette[x].blue; colors[j++] = fPalette[x].blue;
} }
if (fAddonImage >= 0) { if (fAddonImage >= 0) {
set_indexed_colors setIndexedColors = set_indexed_colors setIndexedColors =
(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS, (set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
@@ -720,7 +720,7 @@ status_t
BWindowScreen::_Deactivate() BWindowScreen::_Deactivate()
{ {
CALLED(); CALLED();
if (fDebugState && !fDebugFirst) { if (fDebugState && !fDebugFirst) {
_Suspend(); _Suspend();
SuspensionHook(false); SuspensionHook(false);
@@ -731,11 +731,11 @@ BWindowScreen::_Deactivate()
BScreen screen(this); BScreen screen(this);
SetColorList((rgb_color *)screen.ColorMap()->color_list); SetColorList((rgb_color *)screen.ColorMap()->color_list);
} }
_AssertDisplayMode(fOriginalDisplayMode); _AssertDisplayMode(fOriginalDisplayMode);
_ResetAccelerantHooks(); _ResetAccelerantHooks();
be_app->ShowCursor(); be_app->ShowCursor();
return B_OK; return B_OK;
@@ -746,13 +746,13 @@ status_t
BWindowScreen::_SetupAccelerantHooks() BWindowScreen::_SetupAccelerantHooks()
{ {
CALLED(); CALLED();
status_t status = B_OK; status_t status = B_OK;
if (fAddonImage < 0) if (fAddonImage < 0)
status = _InitClone(); status = _InitClone();
else else
_ResetAccelerantHooks(); _ResetAccelerantHooks();
if (status == B_OK) { if (status == B_OK) {
sWaitIdleHook = fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL); sWaitIdleHook = fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
sReleaseEngineHook = (release_engine)fGetAccelerantHook(B_RELEASE_ENGINE, NULL); sReleaseEngineHook = (release_engine)fGetAccelerantHook(B_RELEASE_ENGINE, NULL);
@@ -761,13 +761,13 @@ BWindowScreen::_SetupAccelerantHooks()
sBlitRectHook = (screen_to_screen_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_BLIT, NULL); sBlitRectHook = (screen_to_screen_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_BLIT, NULL);
sTransparentBlitHook = (screen_to_screen_transparent_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_TRANSPARENT_BLIT, NULL); sTransparentBlitHook = (screen_to_screen_transparent_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_TRANSPARENT_BLIT, NULL);
sScaledFilteredBlitHook = (screen_to_screen_scaled_filtered_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT, NULL); sScaledFilteredBlitHook = (screen_to_screen_scaled_filtered_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT, NULL);
if (fWaitEngineIdle) if (fWaitEngineIdle)
fWaitEngineIdle(); fWaitEngineIdle();
fLockState = 1; fLockState = 1;
} }
return status; return status;
} }
@@ -778,7 +778,7 @@ BWindowScreen::_ResetAccelerantHooks()
CALLED(); CALLED();
if (fWaitEngineIdle) if (fWaitEngineIdle)
fWaitEngineIdle(); fWaitEngineIdle();
sFillRectHook = NULL; sFillRectHook = NULL;
sBlitRectHook = NULL; sBlitRectHook = NULL;
sTransparentBlitHook = NULL; sTransparentBlitHook = NULL;
@@ -787,9 +787,9 @@ BWindowScreen::_ResetAccelerantHooks()
sEngineToken = NULL; sEngineToken = NULL;
sAcquireEngineHook = NULL; sAcquireEngineHook = NULL;
sReleaseEngineHook = NULL; sReleaseEngineHook = NULL;
fWaitEngineIdle = NULL; fWaitEngineIdle = NULL;
fLockState = 0; fLockState = 0;
} }