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

Made Workspaces' initial size and shape depend on screen size, screen proportions and the current layout of one's workspaces. Adjusted Zoom() to be proportional. Also added proportional resizing, which is optional currently, pressing shift while resizing.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34082 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström 2009-11-17 02:49:43 +00:00
parent 5a0982b580
commit 0e02469e9c
1 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/apps/workspaces/Workspaces.cpp
View File

@ -30,6 +30,7 @@
#include <stdlib.h>
#include <string.h>
#include <InterfacePrivate.h>
#include <ViewPrivate.h>
#include <WindowPrivate.h>
@ -208,10 +209,34 @@ WorkspacesSettings::WorkspacesSettings()
&& screen.Frame().left - 5 <= fWindowFrame.left
&& screen.Frame().top - 5 <= fWindowFrame.top)) {
// set to some usable defaults
float screenWidth = screen.Frame().Width();
float screenHeight = screen.Frame().Height();
float aspectRatio = screenWidth / screenHeight;
uint32 columns, rows;
BPrivate::get_workspaces_layout(&columns, &rows);
// default size of ~1/10 of screen width
float workspaceWidth = screenWidth / 10;
float workspaceHeight = workspaceWidth / aspectRatio;
float width = floor(workspaceWidth * columns);
float height = floor(workspaceHeight * rows);
float tabHeight = 20;
// TODO: find tabHeight without being a window
// shrink to fit more
while (width + 2 * kScreenBorderOffset > screenWidth
|| height + 2 * kScreenBorderOffset + tabHeight > screenHeight) {
width = floor(0.95 * width);
height = floor(0.95 * height);
}
fWindowFrame = fScreenFrame;
fWindowFrame.OffsetBy(-kScreenBorderOffset, -kScreenBorderOffset);
fWindowFrame.left = fWindowFrame.right - 160;
fWindowFrame.top = fWindowFrame.bottom - 140;
fWindowFrame.left = fWindowFrame.right - width;
fWindowFrame.top = fWindowFrame.bottom - height;
}
}
@ -602,6 +627,26 @@ WorkspacesWindow::FrameMoved(BPoint origin)
void
WorkspacesWindow::FrameResized(float width, float height)
{
if (!modifiers() & B_SHIFT_KEY) {
BWindow::FrameResized(width, height);
return;
}
uint32 columns, rows;
BPrivate::get_workspaces_layout(&columns, &rows);
BScreen screen;
float screenWidth = screen.Frame().Width();
float screenHeight = screen.Frame().Height();
float windowAspectRatio
= (columns * screenWidth) / (rows * screenHeight);
float newHeight = width / windowAspectRatio;
if (height != newHeight)
ResizeTo(width, newHeight);
fSettings->SetWindowFrame(Frame());
}
@ -610,9 +655,32 @@ void
WorkspacesWindow::Zoom(BPoint origin, float width, float height)
{
BScreen screen;
float screenWidth = screen.Frame().Width();
float screenHeight = screen.Frame().Height();
float aspectRatio = screenWidth / screenHeight;
uint32 columns, rows;
BPrivate::get_workspaces_layout(&columns, &rows);
float workspaceWidth = screenWidth / 10;
float workspaceHeight = workspaceWidth / aspectRatio;
width = floor(workspaceWidth * columns);
height = floor(workspaceHeight * rows);
float tabHeight = Frame().top - DecoratorFrame().top;
while (width + 2 * kScreenBorderOffset > screenWidth
|| height + 2 * kScreenBorderOffset + tabHeight > screenHeight) {
width = floor(0.95 * width);
height = floor(0.95 * height);
}
ResizeTo(width, height);
origin = screen.Frame().RightBottom();
origin.x -= kScreenBorderOffset + fSettings->WindowFrame().Width();
origin.y -= kScreenBorderOffset + fSettings->WindowFrame().Height();
origin.x -= kScreenBorderOffset + width;
origin.y -= kScreenBorderOffset + height;
MoveTo(origin);
}