Fix constant IDs, remove ZoomWindow

This commit is contained in:
elasota
2020-02-26 12:26:19 -05:00
parent cc17911776
commit f1d7e1f52f
3 changed files with 19 additions and 26 deletions

View File

@@ -75,12 +75,12 @@ void HandleMouseEvent (const GpMouseInputEvent &theEvent, uint32_t tick)
switch (thePart)
{
case inMenuBar:
case RegionIDs::kMenuBar:
menuChoice = MenuSelect(evtPoint);
DoMenuChoice(menuChoice);
break;
case inDrag:
case RegionIDs::kTitleBar:
PortabilityLayer::WindowManager::GetInstance()->DragWindow(whichWindow, evtPoint, thisMac.screen);
if (whichWindow == mainWindow)
GetWindowLeftTop(whichWindow, &isEditH, &isEditV);
@@ -95,7 +95,7 @@ void HandleMouseEvent (const GpMouseInputEvent &theEvent, uint32_t tick)
HiliteAllWindows();
break;
case inGoAway:
case RegionIDs::kClose:
if (TrackGoAway(whichWindow, evtPoint))
{
if (whichWindow == mapWindow)
@@ -109,7 +109,7 @@ void HandleMouseEvent (const GpMouseInputEvent &theEvent, uint32_t tick)
}
break;
case inGrow:
case RegionIDs::kExpand:
if (whichWindow == mapWindow)
{
newSize = GrowWindow(mapWindow, evtPoint, &thisMac.gray);
@@ -117,13 +117,7 @@ void HandleMouseEvent (const GpMouseInputEvent &theEvent, uint32_t tick)
}
break;
case inZoomIn:
case inZoomOut:
if (TrackBox(whichWindow, evtPoint, thePart))
ZoomWindow(whichWindow, thePart, true);
break;
case inContent:
case RegionIDs::kContent:
if (whichWindow == mainWindow)
{
hDelta = evtPoint.h - lastWhere.h;

View File

@@ -131,11 +131,6 @@ bool TrackBox(WindowPtr window, Point point, int part)
return false;
}
void ZoomWindow(WindowPtr window, int part, bool bringToFront)
{
PL_NotYetImplemented();
}
void HiliteWindow(WindowPtr window, bool highlighted)
{
PL_NotYetImplemented();

View File

@@ -197,16 +197,21 @@ typedef WindowPtr WindowRef; // wtf?
struct KeyDownStates;
enum RegionID
namespace RegionIDs
{
inMenuBar = 1,
inContent,
inDrag,
inGrow,
inGoAway,
inZoomIn,
inZoomOut,
};
enum RegionID
{
kNone,
kMenuBar = 1,
kContent,
kTitleBar,
kClose,
kExpand,
};
}
typedef RegionIDs::RegionID RegionID_t;
enum WindowRegionType
{
@@ -251,7 +256,6 @@ void BringToFront(WindowPtr window);
bool TrackGoAway(WindowPtr window, Point point); // Returns true if the close box was actually clicked (?)
Int32 GrowWindow(WindowPtr window, Point start, Rect *size);
bool TrackBox(WindowPtr window, Point point, int part); // Returns true if grow/shrink box was clicked (part corresponds to type)
void ZoomWindow(WindowPtr window, int part, bool bringToFront);
void HiliteWindow(WindowPtr window, bool highlighted);
void DisposeWindow(WindowPtr window);
void GetWindowBounds(WindowPtr window, WindowRegionType windowRegion, Rect *rect);