WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

More editor progress

Browse Source
This commit is contained in:
elasota
2020-02-18 20:53:54 -05:00
parent 42826a5d58
commit 9daee7af4e
13 changed files with 68 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
GpApp/RoomInfo.cpp
View File

@@ -149,7 +149,7 @@ void DragMiniTile (DrawSurface *surface, Point mouseIs, short *newTileOver)
QOffsetRect(&dragRect, mouseIs.h - mouseWas.h, 0);
surface->InvertFrameRect(dragRect, pattern);
if (PtInRect(mouseIs, &tileDest)) // is cursor in the drop rect
if (tileDest.Contains(mouseIs)) // is cursor in the drop rect
{
*newTileOver = (mouseIs.h - tileDest.left) / kMiniTileWide;
if (*newTileOver != wasTileOver)
@@ -259,7 +259,7 @@ void HiliteTileOver (DrawSurface *surface, Point mouseIs)
{
short newTileOver;
if (PtInRect(mouseIs, &tileSrc))
if (tileSrc.Contains(mouseIs))
{
if (cursorIs != kHandCursor)
{
@@ -323,7 +323,7 @@ void HiliteTileOver (DrawSurface *surface, Point mouseIs)
tileOver = -1;
}
if (PtInRect(mouseIs, &editTETextBox))
if (editTETextBox.Contains(mouseIs))
{
if (cursorIs != kBeamCursor)
{
@@ -384,7 +384,7 @@ Boolean RoomFilter (Dialog *dial, EventRecord *event, short *item)
case mouseDown:
mouseIs = event->where;
mouseIs -= dial->GetWindow()->TopLeftCoord();
if (PtInRect(mouseIs, &tileSrc))
if (tileSrc.Contains(mouseIs))
{
if (StillDown())
{
@@ -694,22 +694,22 @@ Boolean OriginalArtFilter (Dialog *dial, EventRecord *event, short *item)
case mouseDown:
mouseIs = event->where;
mouseIs -= dial->GetWindow()->TopLeftCoord();
if (PtInRect(mouseIs, &leftBound))
if (leftBound.Contains(mouseIs))
{
*item = 7;
return(true);
}
else if (PtInRect(mouseIs, &topBound))
else if (topBound.Contains(mouseIs))
{
*item = 8;
return(true);
}
else if (PtInRect(mouseIs, &rightBound))
else if (rightBound.Contains(mouseIs))
{
*item = 9;
return(true);
}
else if (PtInRect(mouseIs, &bottomBound))
else if (bottomBound.Contains(mouseIs))
{
*item = 10;
return(true);