From 7b7ce468c5e5425826253764b6009b3d5e96a0d3 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 14 Oct 2014 14:09:22 +0200 Subject: [PATCH] Use DISPOSE_ON_CLOSE for JFrame. --- DrawingWindow.java | 2 +- TODO | 1 - Test.java | 28 +++++++++++++++++++++++++++- overview.html | 3 ++- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/DrawingWindow.java b/DrawingWindow.java index 0fd0571..3b42553 100644 --- a/DrawingWindow.java +++ b/DrawingWindow.java @@ -636,7 +636,7 @@ public class DrawingWindow { frame.add(panel); frame.pack(); frame.setResizable(false); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); frame.addKeyListener(panel); frame.setLocationByPlatform(true); frame.setVisible(true); diff --git a/TODO b/TODO index d518fc7..52db38a 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -* Add set(Bg)Color with int * Add waitMousePress * Check if drawText can be improved (alignment) * Add drawTextBg? diff --git a/Test.java b/Test.java index ee95f63..74038e2 100644 --- a/Test.java +++ b/Test.java @@ -1,6 +1,8 @@ class Test{ public static void main(String[] args) { - DrawingWindow w = new DrawingWindow("Test!", 400, 400); + DrawingWindow w; + + w = new DrawingWindow("Test!", 400, 400); w.setColor("lawngreen"); for (int i = 0; i < 12; i++) { @@ -22,5 +24,29 @@ class Test{ w.drawTriangle(p, 125, p + i, 125 + i/2, p, 125 + i); w.fillTriangle(p, 150, p + i, 150 + i/2, p, 150 + i); } + + w = new DrawingWindow("Test!", 800, 600); + + w.setBgColor("red"); + w.setColor("blue"); + for (int i = 0; i < 10; i++) { + w.clearGraph(); + for (int y = 0; y < w.height; y++) { + for (int x = 0; x < w.width; x++) { + w.drawPoint(x, y); + } + } + } + w.setColor("white"); + for (int i = 0; i < 10; i++) { + w.clearGraph(); + for (int y = 0; y < w.height; y++) { + for (int x = 0; x < w.width; x++) { + w.drawPoint(x, y); + } + w.sync(); + } + } + w.closeGraph(); } } diff --git a/overview.html b/overview.html index b92eb09..89e27f4 100644 --- a/overview.html +++ b/overview.html @@ -39,10 +39,11 @@

Modifications

--- lun. 14 oct. 2014 13:33:48 +0200
+-- lun. 14 oct. 2014 14:09:22 +0200
 
         * Ajout des méthodes setColor(int) et setBgColor(int).
         * Liste de noms de couleurs plus complète.
+        * Ne termine l'application que lorsque la dernière fenêtre est fermée.
     
-- 2.20.1