Changeset 664

Timestamp:

01/08/14 10:37:24 (10 years ago)

Author:

jts21

Message:

Add tooltip template to settings, and make _tooltipItem a static variable of the Item class which is set to whichever tooltip needs to be displayed

Location:

trunk/src/org/expeditee

Files:

• gui/Frame.java (modified) (1 diff)
• gui/FrameGraphics.java (modified) (1 diff)
• items/Item.java (modified) (3 diffs)
• settings/UserSettings.java (modified) (1 diff)

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

@@ -511 +511 @@
 
                 return t;
+        }
+        
+        public Item getTooltipTextItem(String tooltipText) {
+                return getTextItem(tooltipText, UserSettings.TooltipTemplate.get().copy());
         }
 

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

@@ -523 +523 @@
                         if(current != null) {
                                 current.paintTooltip(bg);
+                        } else {
+                                Item.clearTooltipOwner();
                         }
                 }

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

@@ -159 +159 @@
         
         private String _tooltip = null;
-        private Text _tooltipItem = null;
+        private static Text _tooltipItem = null;
+        private static Item _tooltipOwner = null;
 
         public static void DuplicateItem(Item source, Item dest) {
@@ -1129 +1130 @@
         public void setTooltip(String tooltip) {
                 _tooltip = tooltip;
-                _tooltipItem = null;
         }
         
@@ -1136 +1136 @@
         }
         
+        public static void clearTooltipOwner() {
+                _tooltipOwner = null;
+        }
+        
         public void paintTooltip(Graphics2D g) {
-                // don't try to show an empty tooltip
+                if(_tooltipOwner != this) {
+                        _tooltipItem = null;
+                        _tooltipOwner = this;
+                }
+                // generate tooltip item
                 if(_tooltipItem == null) {
                         if(_tooltip != null && _tooltip.trim().length() != 0) {
-                                _tooltipItem = (Text) getParentOrCurrentFrame().getStatsTextItem(_tooltip);
+                                _tooltipItem = (Text) getParentOrCurrentFrame().getTooltipTextItem(_tooltip);
                                 _tooltipItem.setWidth(300);
                         } else {

trunk/src/org/expeditee/settings/UserSettings.java

@@ -240 +240 @@
         };
         
+        private static final Text tooltipTemplate() {
+                Text t = new Text("@StatsTemplate");
+                t.setColor(Color.BLACK);
+                t.setBackgroundColor(new Color(0.7F, 0.7F, 0.9F));
+                // t.setFamily(Text.MONOSPACED_FONT);
+                t.setSize(14);
+                return t;
+        }
+        public static final GenericSetting<Text> TooltipTemplate = new GenericSetting<Text>(Text.class, "Template for tooltips", tooltipTemplate()) {
+                @Override
+                public boolean setSetting(Text text) {
+                        _value = text.getTemplateForm();
+                        return true;
+                }
+        };
+        
         /*
          * Colorwheels