Author: dmaliarevich
Date: 2009-05-07 08:32:40 -0400 (Thu, 07 May 2009)
New Revision: 15106
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4270, tooltips were fixed.
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-05-07
10:09:49 UTC (rev 15105)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2009-05-07
12:32:40 UTC (rev 15106)
@@ -344,17 +344,32 @@
if (currentSashInfo.cursorOver != i) {
currentSashInfo.cursorOver = i;
currentSashInfo.sash.redraw();
+ String splitting = VpePreference.VISUAL_SOURCE_EDITORS_SPLITTING.getValue();
switch (locs[ARROW_TYPE_INDEX]) {
- case UP_ARROW:
- case DOWN_ARROW:
- currentSashInfo.sash.setToolTipText(VpeUIMessages.RESTORE_PREVIOUS_LOCATION);
- break;
- case UP_MAX_ARROW:
- currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
- break;
- case DOWN_MAX_ARROW:
- currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
- break;
+ case UP_ARROW:
+ case DOWN_ARROW:
+
currentSashInfo.sash.setToolTipText(VpeUIMessages.RESTORE_PREVIOUS_LOCATION);
+ break;
+ case UP_MAX_ARROW:
+ /*
+ *
https://jira.jboss.org/jira/browse/JBIDE-4270
+ * Tooltip text should correspond panes position.
+ */
+ if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting)
+ || LAYOUT_VERTICAL_SOURCE_TOP.equalsIgnoreCase(splitting)) {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
+ } else {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
+ }
+ break;
+ case DOWN_MAX_ARROW:
+ if (LAYOUT_HORIZONTAL_SOURCE_LEFT.equalsIgnoreCase(splitting)
+ || LAYOUT_VERTICAL_SOURCE_TOP.equalsIgnoreCase(splitting)) {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
+ } else {
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
+ }
+ break;
}
}
return;
@@ -545,7 +560,7 @@
weights[0] = 1000-sashinfo.weight; // Assume weights are always in units of 1000.
weights[1] = sashinfo.weight;
sashinfo.weight = NO_WEIGHT;
-
+
setWeights(weights);
fireDividerMoved();
}
@@ -566,6 +581,7 @@
setWeights(weights);
if (upperFocus)
children[1].setFocus();
+
fireDividerMoved();
}
@@ -576,7 +592,7 @@
weights[0] = 1000-sashinfo.weight; // Assume weights are always in units of 1000.
weights[1] = sashinfo.weight;
sashinfo.weight = NO_WEIGHT;
-
+
setWeights(weights);
fireDividerMoved();
}
@@ -595,7 +611,8 @@
boolean lowerFocus = isFocusAncestorA(children[1]);
setWeights(weights);
if (lowerFocus)
- children[0].setFocus();
+ children[0].setFocus();
+
fireDividerMoved();
}