Changeset 229

Timestamp:

08/16/08 00:20:36 (16 years ago)

Author:

bjn8

Message:

Refector a little bit of code for reuse. Also fixed a bug with widgets

Location:

trunk/src/org/expeditee

Files:

• gui/FrameKeyboardActions.java (modified) (2 diffs)
• items/Text.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -31 +31 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.stats.SessionStats;
 
@@ -107 +108 @@
 
                 // check for dot's being replaced with text
-                if (on != null && on instanceof Dot) {
+                if (on != null && on instanceof Dot && !(on instanceof WidgetCorner)) {
                         if (ch == KeyEvent.VK_BACK_SPACE || ch == KeyEvent.VK_DELETE) {
                                 return;

trunk/src/org/expeditee/items/Text.java

@@ -1317 +1317 @@
                 return new Point(start, end);
         }
+        
+        /**
+         * @param mouseButton
+         *              Either MouseEvent.BUTTON1, MouseEvent.BUTTON2 or MouseEvent.BUTTON3.
+         *              
+         * @return
+         *              The color for the text selection based on the given mouse click
+         */
+        protected Color getSelectionColor(int mouseButton) {
+
+                /*
+                 * Color main = getPaintColor(); Color back = getPaintBackgroundColor();
+                 * 
+                 * if (Math.abs(main.getRed() - back.getRed()) < 10 &&
+                 * Math.abs(main.getGreen() - back.getGreen()) < 10 &&
+                 * Math.abs(main.getBlue() - back.getBlue()) < 10) { selection = new
+                 * Color(Math.abs(255 - main.getRed()), Math .abs(255 -
+                 * main.getGreen()), Math.abs(255 - main.getBlue())); } else { selection =
+                 * new Color((main.getRed() + (back.getRed() * 2)) / 3, (main.getGreen() +
+                 * (back.getGreen() * 2)) / 3, (main .getBlue() + (back.getBlue() * 2)) /
+                 * 3); }
+                 */
+                int green = 160;
+                int red = 160;
+                int blue = 160;
+
+                if (FrameMouseActions.wasDeleteClicked()) {
+                        green = 235;
+                        red = 235;
+                        blue = 140;
+                } else if (mouseButton == MouseEvent.BUTTON1) {
+                        red = 255;
+                } else if (mouseButton == MouseEvent.BUTTON2) {
+                        green = 255;
+                } else if (mouseButton == MouseEvent.BUTTON3) {
+                        blue = 255;
+                }
+                
+                return new Color(red, green, blue);
+        }
 
         @Override
@@ -1377 +1417 @@
                 g.setColor(c);
 
-                Color selection;
-
-                /*
-                 * Color main = getPaintColor(); Color back = getPaintBackgroundColor();
-                 * 
-                 * if (Math.abs(main.getRed() - back.getRed()) < 10 &&
-                 * Math.abs(main.getGreen() - back.getGreen()) < 10 &&
-                 * Math.abs(main.getBlue() - back.getBlue()) < 10) { selection = new
-                 * Color(Math.abs(255 - main.getRed()), Math .abs(255 -
-                 * main.getGreen()), Math.abs(255 - main.getBlue())); } else { selection =
-                 * new Color((main.getRed() + (back.getRed() * 2)) / 3, (main.getGreen() +
-                 * (back.getGreen() * 2)) / 3, (main .getBlue() + (back.getBlue() * 2)) /
-                 * 3); }
-                 */
-                int green = 160;
-                int red = 160;
-                int blue = 160;
-
-                if (FrameMouseActions.wasDeleteClicked()) {
-                        green = 235;
-                        red = 235;
-                        blue = 140;
-                } else if (FrameMouseActions.getLastMouseButton() == MouseEvent.BUTTON1) {
-                        red = 255;
-                } else if (FrameMouseActions.getLastMouseButton() == MouseEvent.BUTTON2) {
-                        green = 255;
-                } else if (FrameMouseActions.getLastMouseButton() == MouseEvent.BUTTON3) {
-                        blue = 255;
-                }
-                selection = new Color(red, green, blue);
+                Color selection = getSelectionColor(FrameMouseActions.getLastMouseButton());
 
                 // width -= getX();