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

The size limits are now correctly enforced on window creation, ie. the ResizeLimits 

test application now works as it should.
DefaultDecorator::GetSizeLimits() did work correctly, there was no need
to have extra protection limits.
Enabled Stephan's automatic resize code on BWindow::SetSizeLimits() again, and
added a short comment why I think R5's behaviour is just a bug/leftover.
Moved guts of ResizeBy() into _ResizeBy() that doesn't send the update message
to the client, and is now called in the constructor to make sure the border
size is within limits. Also made it work there, as fTopLayer is NULL in that
environment.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13304 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-06-28 02:00:48 +00:00
parent d4e2c64c2a
commit 276aa135a7
2 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/servers/app/WinBorder.cpp
View File

@ -59,11 +59,11 @@
WinBorder::WinBorder(const BRect &frame,
const char *name,
const uint32 wlook,
const uint32 wfeel,
const uint32 wflags,
const uint32 wwksindex,
ServerWindow *win,
const uint32 look,
const uint32 feel,
const uint32 flags,
const uint32 workspaces,
ServerWindow *window,
DisplayDriver *driver)
: Layer(frame, name, B_NULL_TOKEN, B_FOLLOW_NONE, 0UL, driver),
fDecorator(NULL),
@ -90,22 +90,21 @@ WinBorder::WinBorder(const BRect &frame,
fInUpdate(false),
fRequestSent(false),
fLook(wlook),
fFeel(-1),
fLook(look),
fLevel(-100),
fWindowFlags(wflags),
fWorkspaces(wwksindex),
fWindowFlags(flags),
fWorkspaces(workspaces),
fMinWidth(1.0),
fMaxWidth(10000.0),
fMaxWidth(32768.0),
fMinHeight(1.0),
fMaxHeight(10000.0),
fMaxHeight(32768.0),
cnt(0) // for debugging
{
// unlike BViews, windows start off as hidden
fHidden = true;
fServerWin = win;
fServerWin = window;
fClassID = AS_WINBORDER_CLASS;
fAdFlags = fAdFlags | B_LAYER_CHILDREN_DEPENDANT;
fFlags = B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE;
@ -113,34 +112,19 @@ WinBorder::WinBorder(const BRect &frame,
#ifdef NEW_CLIPPING
fRebuildDecRegion = true;
#endif
QuietlySetFeel(wfeel);
if (fFeel != B_NO_BORDER_WINDOW_LOOK) {
// ToDo: these should probably restricted by the decorator only, but
// the code there doesn't look too robust to me currently
fMinWidth = 20;
fMinHeight = 20;
}
if (fFrame.Width() < fMinWidth)
fFrame.right = fFrame.left + fMinWidth;
if (fFrame.Height() < fMinHeight)
fFrame.bottom = fFrame.top + fMinHeight;
QuietlySetFeel(feel);
if (fFeel != B_NO_BORDER_WINDOW_LOOK) {
fDecorator = gDecorManager.AllocateDecorator(frame, name, fLook, fFeel,
fWindowFlags, fDriver);
if (fDecorator) {
if (fDecorator)
fDecorator->GetSizeLimits(&fMinWidth, &fMinHeight, &fMaxWidth, &fMaxHeight);
// we need to change our size to let the decorator fit
if (fMinWidth > fFrame.Width())
fFrame.right = fFrame.left + fMinWidth;
if (fMinHeight > fFrame.Height())
fFrame.bottom = fFrame.top + fMinHeight;
}
}
// do we need to change our size to let the decorator fit?
// _ResizeBy() will adapt the frame for validity before resizing
_ResizeBy(0, 0);
#ifndef NEW_CLIPPING
RebuildFullRegion();
#endif
@ -149,9 +133,10 @@ WinBorder::WinBorder(const BRect &frame,
STRACE(("WinBorder %s:\n", GetName()));
STRACE(("\tFrame: (%.1f, %.1f, %.1f, %.1f)\n", r.left, r.top, r.right, r.bottom));
STRACE(("\tWindow %s\n", win ? win->Title() : "NULL"));
STRACE(("\tWindow %s\n", window ? window->Title() : "NULL"));
}
WinBorder::~WinBorder()
{
STRACE(("WinBorder(%s)::~WinBorder()\n",GetName()));
@ -240,12 +225,34 @@ fInUpdateRegion.OffsetBy(x, y);
}
}
//! Resizes the winborder with redraw
void
WinBorder::ResizeBy(float x, float y)
{
STRACE(("WinBorder(%s)::ResizeBy()\n", GetName()));
if (!_ResizeBy(x, y))
return;
if (Window()) {
// send a message to the client informing about the changed size
BMessage msg(B_WINDOW_RESIZED);
msg.AddInt64("when", system_time());
BRect frame(fTopLayer->Frame());
msg.AddInt32("width", frame.IntegerWidth());
msg.AddInt32("height", frame.IntegerHeight());
Window()->SendMessageToClient(&msg, B_NULL_TOKEN, false);
}
}
//! Resizes the winborder with redraw
bool
WinBorder::_ResizeBy(float x, float y)
{
// ToDo: remove/fix these?
x = (float)int32(x);
y = (float)int32(y);
@ -267,7 +274,7 @@ y = (float)int32(y);
y = wantHeight - fFrame.Height();
if (x == 0.0 && y == 0.0)
return;
return false;
if (fDecorator)
fDecorator->ResizeBy(x, y);
@ -278,7 +285,8 @@ y = (float)int32(y);
fFrame.right += x;
fFrame.bottom += y;
fTopLayer->resize_layer(x, y);
if (fTopLayer)
fTopLayer->resize_layer(x, y);
} else {
resize_layer(x, y);
}
@ -287,19 +295,10 @@ y = (float)int32(y);
// Do? I don't think so. The new move/resize/scroll hooks should handle these
#endif
if (Window()) {
// send a message to the client informing about the changed size
BMessage msg(B_WINDOW_RESIZED);
msg.AddInt64("when", system_time());
BRect frame(fTopLayer->Frame());
msg.AddInt32("width", frame.IntegerWidth());
msg.AddInt32("height", frame.IntegerHeight());
Window()->SendMessageToClient(&msg, B_NULL_TOKEN, false);
}
return true;
}
// UpdateStart
void
WinBorder::UpdateStart()
@ -373,9 +372,13 @@ WinBorder::SetSizeLimits(float minWidth, float maxWidth,
if (fMaxHeight < fMinHeight)
fMaxHeight = fMinHeight;
#if 0 // On R5, Windows don't automatically resize (the code works though)
// Automatically resize the window to fit these new limits
// if it does not already.
// On R5, Windows don't automatically resize, but since
// BWindow::ResizeTo() even honors the limits, I would guess
// this is a bug that we don't have to adopt
float minWidthDiff = fMinWidth - fFrame.Width();
float minHeightDiff = fMinHeight - fFrame.Height();
float maxWidthDiff = fMaxWidth - fFrame.Width();
@ -394,7 +397,6 @@ WinBorder::SetSizeLimits(float minWidth, float maxWidth,
yDiff = maxHeightDiff;
ResizeBy(xDiff, yDiff);
#endif
}
// GetSizeLimits
@ -628,7 +630,7 @@ WinBorder::QuietlySetFeel(int32 feel)
{
fFeel = feel;
switch(fFeel) {
switch (fFeel) {
case B_FLOATING_SUBSET_WINDOW_FEEL:
case B_FLOATING_APP_WINDOW_FEEL:
fLevel = B_FLOATING_APP;

13
src/servers/app/WinBorder.h
View File

@ -49,13 +49,13 @@ class PointerEvent {
class WinBorder : public Layer {
public:
WinBorder(const BRect &r,
WinBorder(const BRect &frame,
const char *name,
const uint32 wlook,
const uint32 wfeel,
const uint32 wflags,
const uint32 wwksindex,
ServerWindow *win,
const uint32 look,
const uint32 feel,
const uint32 flags,
const uint32 workspaces,
ServerWindow *window,
DisplayDriver *driver);
virtual ~WinBorder();
@ -136,6 +136,7 @@ class WinBorder : public Layer {
friend class RootLayer;
click_type _ActionFor(const PointerEvent& evt) const;
bool _ResizeBy(float x, float y);
Decorator* fDecorator;
Layer* fTopLayer;