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

Fixed a crasher in setFocus() and some dead code in ResizeTo()

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3666 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
haydentech 2003-06-25 20:50:42 +00:00
parent 97c931825e
commit 3aa0c906ba
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/kits/interface/Window.cpp
View File

@ -53,7 +53,7 @@
#include <Roster.h> #include <Roster.h>
// Local Includes -------------------------------------------------------------- // Local Includes --------------------------------------------------------------
#include "WindowAux.h" #include <WindowAux.h>
#include <TokenSpace.h> #include <TokenSpace.h>
#include "MessageUtils.h" #include "MessageUtils.h"
@ -1769,11 +1769,11 @@ void BWindow::ResizeBy(float dx, float dy){
void BWindow::ResizeTo(float width, float height){ void BWindow::ResizeTo(float width, float height){
// stay in minimum & maximum frame limits // stay in minimum & maximum frame limits
width < fMinWindWidth ? fMinWindWidth : width; width = (width < fMinWindWidth) ? fMinWindWidth : width;
width > fMaxWindWidth ? fMaxWindWidth : width; width = (width > fMaxWindWidth) ? fMaxWindWidth : width;
height < fMinWindHeight ? fMinWindHeight : height; height = (height < fMinWindHeight) ? fMinWindHeight : height;
height > fMaxWindHeight ? fMaxWindHeight : height; height = (height > fMaxWindHeight) ? fMaxWindHeight : height;
serverLink->SetOpCode( AS_WINDOW_RESIZE ); serverLink->SetOpCode( AS_WINDOW_RESIZE );
serverLink->Attach( width ); serverLink->Attach( width );
@ -2418,12 +2418,20 @@ void BWindow::detachView(BView *aView){
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BWindow::setFocus(BView *focusView, bool notifyInputServer){ void BWindow::setFocus(BView *focusView, bool notifyInputServer){
BView* previousFocus = fFocus;
if (previousFocus == focusView)
return;
fFocus = NULL; fFocus = NULL;
fFocus->Draw( fFocus->Bounds() );
if (previousFocus != NULL)
previousFocus->Invalidate();
fFocus = focusView; fFocus = focusView;
fFocus->Draw( fFocus->Bounds() );
if (focusView != NULL)
focusView->Invalidate();
// TODO: find out why do we have to notify input server. // TODO: find out why do we have to notify input server.
if (notifyInputServer){ if (notifyInputServer){