From 9a7216ad34f7b8491d50f755a3c4b99fa97e4249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Sat, 13 Mar 2021 23:40:05 +0100
Subject: [PATCH] Refactor BaseWindow

---
 .../base/api/game/gui/window/BaseWindow.java         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java
index fe8f6ab8..65162ada 100644
--- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java
+++ b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java
@@ -1,8 +1,12 @@
 package com.bartlomiejpluta.base.api.game.gui.window;
 
 import com.bartlomiejpluta.base.api.game.gui.base.BaseWidget;
+import com.bartlomiejpluta.base.api.game.gui.base.GUI;
 import com.bartlomiejpluta.base.api.game.gui.component.Component;
 import com.bartlomiejpluta.base.api.game.input.KeyEvent;
+import com.bartlomiejpluta.base.api.game.screen.Screen;
+
+import static java.util.Objects.requireNonNull;
 
 public abstract class BaseWindow extends BaseWidget implements Window {
    protected Component content;
@@ -15,7 +19,7 @@ public abstract class BaseWindow extends BaseWidget implements Window {
 
    @Override
    public void setWindowPosition(WindowPosition windowPosition) {
-      this.windowPosition = windowPosition;
+      this.windowPosition = requireNonNull(windowPosition);
    }
 
    @Override
@@ -28,6 +32,12 @@ public abstract class BaseWindow extends BaseWidget implements Window {
       return content.getMarginTop() + content.getActualHeight() + content.getMarginBottom();
    }
 
+   @Override
+   public void draw(Screen screen, GUI gui) {
+      content.setPosition(x + paddingLeft, y + paddingTop);
+      content.draw(screen, gui);
+   }
+
    @Override
    public void onOpen(WindowManager manager) {
       // do nothing