Refactor out clip rect

This commit is contained in:
elasota
2020-05-21 03:39:33 -04:00
parent 438e7b2138
commit 432cdbcc3a
5 changed files with 0 additions and 22 deletions

View File

@@ -205,8 +205,6 @@ void OpenMainWindow (void)
DrawSurface *mainWindowSurface = mainWindow->GetDrawSurface(); DrawSurface *mainWindowSurface = mainWindow->GetDrawSurface();
mainWindowSurface->SetClipRect(mainWindowRect);
whichRoom = GetFirstRoomNumber(); whichRoom = GetFirstRoomNumber();
CopyRoomToThisRoom(whichRoom); CopyRoomToThisRoom(whichRoom);
ReflectCurrentRoom(false); ReflectCurrentRoom(false);
@@ -252,7 +250,6 @@ void OpenMainWindow (void)
DrawSurface *mainWindowSurface = mainWindow->GetDrawSurface(); DrawSurface *mainWindowSurface = mainWindow->GetDrawSurface();
mainWindowSurface->SetClipRect(mainWindowRect);
// CopyRgn(mainWindow->clipRgn, mainWindow->visRgn); // CopyRgn(mainWindow->clipRgn, mainWindow->visRgn);
mainWindowSurface->FillRect(mainWindowRect, blackColor); mainWindowSurface->FillRect(mainWindowRect, blackColor);

View File

@@ -207,9 +207,6 @@ void RedrawMapContents (void)
DrawSurface *surface = mapWindow->GetDrawSurface(); DrawSurface *surface = mapWindow->GetDrawSurface();
const Rect wasClip = surface->GetClipRect();
surface->SetClipRect(newClip);
for (i = 0; i < mapRoomsHigh; i++) for (i = 0; i < mapRoomsHigh; i++)
{ {
for (h = 0; h < mapRoomsWide; h++) for (h = 0; h < mapRoomsWide; h++)
@@ -291,8 +288,6 @@ void RedrawMapContents (void)
surface->FrameRect(activeRoomRect, redColor); surface->FrameRect(activeRoomRect, redColor);
InsetRect(&activeRoomRect, -1, -1); InsetRect(&activeRoomRect, -1, -1);
} }
surface->SetClipRect(wasClip);
} }
#endif #endif

View File

@@ -126,7 +126,6 @@ void OpenMessageWindow (const PLPasStr &title)
DrawSurface *surface = mssgWindow->GetDrawSurface(); DrawSurface *surface = mssgWindow->GetDrawSurface();
surface->SetClipRect(mssgWindowRect);
surface->SetSystemFont(12, 0); surface->SetSystemFont(12, 0);
} }

View File

@@ -732,16 +732,6 @@ void DrawSurface::DrawPicture(THandle<BitmapImage> pictHdl, const Rect &bounds)
m_port.SetDirty(PortabilityLayer::QDPortDirtyFlag_Contents); m_port.SetDirty(PortabilityLayer::QDPortDirtyFlag_Contents);
} }
Rect DrawSurface::GetClipRect() const
{
return m_port.GetState()->m_clipRect;
}
void DrawSurface::SetClipRect(const Rect &rect)
{
m_port.GetState()->m_clipRect = rect;;
}
PortabilityLayer::RenderedFont *DrawSurface::ResolveFont(bool aa) const PortabilityLayer::RenderedFont *DrawSurface::ResolveFont(bool aa) const
{ {
const PortabilityLayer::QDState *qdState = m_port.GetState(); const PortabilityLayer::QDState *qdState = m_port.GetState();

View File

@@ -88,9 +88,6 @@ struct DrawSurface
void DrawPicture(THandle<BitmapImage> pictHandle, const Rect &rect); void DrawPicture(THandle<BitmapImage> pictHandle, const Rect &rect);
Rect GetClipRect() const;
void SetClipRect(const Rect &rect);
PortabilityLayer::RenderedFont *ResolveFont(bool aa) const; PortabilityLayer::RenderedFont *ResolveFont(bool aa) const;
IGpDisplayDriverSurface *m_ddSurface; IGpDisplayDriverSurface *m_ddSurface;