X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTWindow.java;h=c7b59c82ab5d9d19a90f843668c6695c03c122b5;hb=3649b9210ea425f398ba8c24f9509669cf72aa96;hp=e1d0299b5f7463cec7eec3dad3b50276f1042824;hpb=bd8d51fa0a33d6d27dba088c57791e1650512fc0;p=fanfix.git

diff --git a/src/jexer/TWindow.java b/src/jexer/TWindow.java
index e1d0299..c7b59c8 100644
--- a/src/jexer/TWindow.java
+++ b/src/jexer/TWindow.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
  * License: LGPLv3 or later
@@ -374,17 +374,17 @@ public class TWindow extends TWidget {
         if (!isModal()
             && (inWindowMove || inWindowResize || inKeyboardResize)
         ) {
-            assert (getActive());
+            assert (isActive());
             return getTheme().getColor("twindow.background.windowmove");
         } else if (isModal() && inWindowMove) {
-            assert (getActive());
+            assert (isActive());
             return getTheme().getColor("twindow.background.modal");
         } else if (isModal()) {
-            if (getActive()) {
+            if (isActive()) {
                 return getTheme().getColor("twindow.background.modal");
             }
             return getTheme().getColor("twindow.background.modal.inactive");
-        } else if (getActive()) {
+        } else if (isActive()) {
             assert (!isModal());
             return getTheme().getColor("twindow.background");
         } else {
@@ -398,22 +398,22 @@ public class TWindow extends TWidget {
      *
      * @return the border color
      */
-    private CellAttributes getBorder() {
+    public CellAttributes getBorder() {
         if (!isModal()
             && (inWindowMove || inWindowResize || inKeyboardResize)
         ) {
-            assert (getActive());
+            assert (isActive());
             return getTheme().getColor("twindow.border.windowmove");
         } else if (isModal() && inWindowMove) {
-            assert (getActive());
+            assert (isActive());
             return getTheme().getColor("twindow.border.modal.windowmove");
         } else if (isModal()) {
-            if (getActive()) {
+            if (isActive()) {
                 return getTheme().getColor("twindow.border.modal");
             } else {
                 return getTheme().getColor("twindow.border.modal.inactive");
             }
-        } else if (getActive()) {
+        } else if (isActive()) {
             assert (!isModal());
             return getTheme().getColor("twindow.border");
         } else {
@@ -431,18 +431,18 @@ public class TWindow extends TWidget {
         if (!isModal()
             && (inWindowMove || inWindowResize || inKeyboardResize)
         ) {
-            assert (getActive());
+            assert (isActive());
             return 1;
         } else if (isModal() && inWindowMove) {
-            assert (getActive());
+            assert (isActive());
             return 1;
         } else if (isModal()) {
-            if (getActive()) {
+            if (isActive()) {
                 return 2;
             } else {
                 return 1;
             }
-        } else if (getActive()) {
+        } else if (isActive()) {
             return 2;
         } else {
             return 1;
@@ -457,6 +457,22 @@ public class TWindow extends TWidget {
         // Default: do nothing
     }
 
+    /**
+     * Called by application.switchWindow() when this window gets the
+     * focus, and also by application.addWindow().
+     */
+    public void onFocus() {
+        // Default: do nothing
+    }
+
+    /**
+     * Called by application.switchWindow() when another window gets the
+     * focus.
+     */
+    public void onUnfocus() {
+        // Default: do nothing
+    }
+
     /**
      * Called by TApplication.drawChildren() to render on screen.
      */
@@ -473,15 +489,15 @@ public class TWindow extends TWidget {
         // Draw the title
         int titleLeft = (getWidth() - title.length() - 2) / 2;
         putCharXY(titleLeft, 0, ' ', border);
-        putStrXY(titleLeft + 1, 0, title);
+        putStringXY(titleLeft + 1, 0, title);
         putCharXY(titleLeft + title.length() + 1, 0, ' ', border);
 
-        if (getActive()) {
+        if (isActive()) {
 
             // Draw the close button
             putCharXY(2, 0, '[', border);
             putCharXY(4, 0, ']', border);
-            if (mouseOnClose() && mouse.getMouse1()) {
+            if (mouseOnClose() && mouse.isMouse1()) {
                 putCharXY(3, 0, GraphicsChars.CP437[0x0F],
                     !isModal()
                     ? getTheme().getColor("twindow.border.windowmove")
@@ -498,7 +514,7 @@ public class TWindow extends TWidget {
 
                 putCharXY(getWidth() - 5, 0, '[', border);
                 putCharXY(getWidth() - 3, 0, ']', border);
-                if (mouseOnMaximize() && mouse.getMouse1()) {
+                if (mouseOnMaximize() && mouse.isMouse1()) {
                     putCharXY(getWidth() - 4, 0, GraphicsChars.CP437[0x0F],
                         getTheme().getColor("twindow.border.windowmove"));
                 } else {
@@ -536,7 +552,7 @@ public class TWindow extends TWidget {
         inKeyboardResize = false;
 
         if ((mouse.getAbsoluteY() == getY())
-            && mouse.getMouse1()
+            && mouse.isMouse1()
             && (getX() <= mouse.getAbsoluteX())
             && (mouse.getAbsoluteX() < getX() + getWidth())
             && !mouseOnClose()
@@ -605,26 +621,26 @@ public class TWindow extends TWidget {
     public void onMouseUp(final TMouseEvent mouse) {
         this.mouse = mouse;
 
-        if ((inWindowMove) && (mouse.getMouse1())) {
+        if ((inWindowMove) && (mouse.isMouse1())) {
             // Stop moving window
             inWindowMove = false;
             return;
         }
 
-        if ((inWindowResize) && (mouse.getMouse1())) {
+        if ((inWindowResize) && (mouse.isMouse1())) {
             // Stop resizing window
             inWindowResize = false;
             return;
         }
 
-        if (mouse.getMouse1() && mouseOnClose()) {
+        if (mouse.isMouse1() && mouseOnClose()) {
             // Close window
             application.closeWindow(this);
             return;
         }
 
         if ((mouse.getAbsoluteY() == getY())
-            && mouse.getMouse1()
+            && mouse.isMouse1()
             && mouseOnMaximize()) {
             if (maximized) {
                 // Restore
@@ -776,6 +792,10 @@ public class TWindow extends TWidget {
                 }
             }
 
+            // Pass a resize event to my children
+            onResize(new TResizeEvent(TResizeEvent.Type.WIDGET,
+                    getWidth(), getHeight()));
+
             return;
         }
 
@@ -999,10 +1019,10 @@ public class TWindow extends TWidget {
      * @param str string to draw
      * @param attr attributes to use (bold, foreColor, backColor)
      */
-    public final void putStrXY(final int x, final int y, final String str,
+    public final void putStringXY(final int x, final int y, final String str,
         final CellAttributes attr) {
 
-        getScreen().putStrXY(x, y, str, attr);
+        getScreen().putStringXY(x, y, str, attr);
     }
 
     /**
@@ -1013,8 +1033,8 @@ public class TWindow extends TWidget {
      * @param y row coordinate.  0 is the top-most row.
      * @param str string to draw
      */
-    public final void putStrXY(final int x, final int y, final String str) {
-        getScreen().putStrXY(x, y, str);
+    public final void putStringXY(final int x, final int y, final String str) {
+        getScreen().putStringXY(x, y, str);
     }
 
     /**