Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workspaces now always accept the first click.

Browse Source 
Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14942 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-11-15 12:24:28 +00:00
parent e4a15e4d45
commit 4d0c856564
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/preferences/workspaces/Workspaces.cpp
View File

@ -1,35 +1,41 @@
/* /*
* Workspaces - OpenBeOS version by Francois Revol revol@free.fr * Copyright 2002-2005, Haiku, Inc.
* This file is distributed under the terms of the OpenBeOS license. * Copyright 2002, François Revol, revol@free.fr.
* This file is distributed under the terms of the MIT License.
* *
* Workspaces window trick found by Michael "Minox" Paine. * Authors:
* (using B_ALL_WORKSPACES as flags in BWindow) * François Revol, revol@free.fr
* Found out that using 0xffffffff as Flags was causing the window not to close on Alt-W * Axel Dörfler, axeld@pinc-software.de
* hey Workspaces get Flags of Window 0 * Oliver "Madison" Kohl,
* gives 0x00008080 which makes it. * Matt Madia
* */
* Other authors: Axel Dörfler, Oliver "Madison" Kohl, Matt Madia
/** Workspaces window trick found by Michael "Minox" Paine.
* (using B_ALL_WORKSPACES as flags in BWindow)
* Found out that using 0xffffffff as Flags was causing the window not to close on Alt-W
* hey Workspaces get Flags of Window 0
* gives 0x00008080 which makes it.
*/ */
#include <Application.h>
#include <Alert.h> #include <Alert.h>
#include <File.h> #include <Application.h>
#include <Window.h>
#include <Screen.h>
#include <Entry.h> #include <Entry.h>
#include <Roster.h> #include <File.h>
#include <Path.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <Path.h>
#include <Roster.h>
#include <Screen.h>
#include <Window.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
// here is the trick :) // here is the trick :)
#define B_WORKSPACES_WINDOW 0x00008000 static const uint32 kWorkspacesWindow = 0x00008000;
static const char *kWorkspacesSignature = "application/x-vnd.Be-WORK"; static const char *kWorkspacesSignature = "application/x-vnd.Be-WORK";
static const char *kWorkspacesSettingFile = "Workspace_data"; static const char *kWorkspacesSettingFile = "Workspace_data";
@ -64,7 +70,7 @@ class WorkspacesWindow : public BWindow {
virtual void Zoom(BPoint origin, float width, float height); virtual void Zoom(BPoint origin, float width, float height);
virtual void MessageReceived(BMessage *msg); virtual void MessageReceived(BMessage *msg);
virtual bool QuitRequested(void); virtual bool QuitRequested();
private: private:
WorkspacesPreferences *fPreferences; WorkspacesPreferences *fPreferences;
@ -76,9 +82,9 @@ class WorkspacesApp : public BApplication {
WorkspacesApp(); WorkspacesApp();
virtual ~WorkspacesApp(); virtual ~WorkspacesApp();
virtual void AboutRequested(void); virtual void AboutRequested();
virtual void ArgvReceived(int32 argc, char **argv); virtual void ArgvReceived(int32 argc, char **argv);
virtual void ReadyToRun(void); virtual void ReadyToRun();
void Usage(const char *programName); void Usage(const char *programName);
@ -186,7 +192,9 @@ WorkspacesPreferences::SetWindowFrame(BRect frame)
WorkspacesWindow::WorkspacesWindow(WorkspacesPreferences *preferences) WorkspacesWindow::WorkspacesWindow(WorkspacesPreferences *preferences)
: BWindow(preferences->WindowFrame(), "Workspaces", B_TITLED_WINDOW_LOOK, : BWindow(preferences->WindowFrame(), "Workspaces", B_TITLED_WINDOW_LOOK,
B_NORMAL_WINDOW_FEEL, B_WORKSPACES_WINDOW | B_AVOID_FRONT, B_ALL_WORKSPACES), B_NORMAL_WINDOW_FEEL,
kWorkspacesWindow | B_AVOID_FRONT | B_WILL_ACCEPT_FIRST_CLICK,
B_ALL_WORKSPACES),
fPreferences(preferences) fPreferences(preferences)
{ {
fPreviousFrame = Frame(); fPreviousFrame = Frame();
@ -258,7 +266,7 @@ WorkspacesWindow::MessageReceived(BMessage *msg)
bool bool
WorkspacesWindow::QuitRequested(void) WorkspacesWindow::QuitRequested()
{ {
be_app->PostMessage(B_QUIT_REQUESTED); be_app->PostMessage(B_QUIT_REQUESTED);
return true; return true;
@ -281,7 +289,7 @@ WorkspacesApp::~WorkspacesApp()
void void
WorkspacesApp::AboutRequested(void) WorkspacesApp::AboutRequested()
{ {
// blocking !! // blocking !!
// the original does the same by the way =) // the original does the same by the way =)
@ -349,7 +357,7 @@ WorkspacesApp::ArgvReceived(int32 argc, char **argv)
void void
WorkspacesApp::ReadyToRun(void) WorkspacesApp::ReadyToRun()
{ {
fWindow->Show(); fWindow->Show();
} }