You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/04/21 23:03:18 UTC
svn commit: r936508 - in /pivot/trunk:
wtk-terra/src/org/apache/pivot/wtk/skin/terra/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/skin/
Author: gbrown
Date: Wed Apr 21 21:03:17 2010
New Revision: 936508
URL: http://svn.apache.org/viewvc?rev=936508&view=rev
Log:
Revert earlier addition of "split" property to ListButton - this will be re-implemented in a later update, along with split support for CalendarButton and ColorPickerButton.
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java?rev=936508&r1=936507&r2=936508&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraListButtonSkin.java Wed Apr 21 21:03:17 2010
@@ -43,8 +43,6 @@ import org.apache.pivot.wtk.Point;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.WindowStateListener;
-import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.Mouse;
import org.apache.pivot.wtk.effects.DropShadowDecorator;
import org.apache.pivot.wtk.effects.Transition;
import org.apache.pivot.wtk.effects.TransitionListener;
@@ -114,9 +112,6 @@ public class TerraListButtonSkin extends
private Transition closeTransition = null;
private DropShadowDecorator dropShadowDecorator = null;
- private int mouseDownX;
- private int mouseDownY;
-
private static final int TRIGGER_WIDTH = 14;
private static final int CLOSE_TRANSITION_DURATION = 250;
@@ -618,15 +613,6 @@ public class TerraListButtonSkin extends
listView.getStyles().put("highlightBackgroundColor", listHighlightBackgroundColor);
}
- // Mouse events
- @Override
- public boolean mouseDown(Component component, Mouse.Button button, int x, int y) {
- boolean consumed = super.mouseDown(component, button, x, y);
- mouseDownX = x;
- mouseDownY = y;
- return consumed;
- }
-
// Button events
@Override
public void buttonPressed(Button button) {
@@ -644,6 +630,8 @@ public class TerraListButtonSkin extends
int width = getWidth();
int height = getHeight();
+ // TODO
+ /*
if (listButton.isSplit()) {
Bounds triggerBounds = new Bounds(Math.max(width - TRIGGER_WIDTH - 1, 0), 0,
TRIGGER_WIDTH + 1, Math.max(height, 0));
@@ -651,6 +639,7 @@ public class TerraListButtonSkin extends
return;
}
}
+ */
// Adjust for list size
int listSize = listButton.getListSize();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java?rev=936508&r1=936507&r2=936508&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButton.java Wed Apr 21 21:03:17 2010
@@ -62,13 +62,6 @@ public class ListButton extends Button {
listener.listSizeChanged(listButton, previousListSize);
}
}
-
- @Override
- public void splitChanged(ListButton listButton) {
- for (ListButtonListener listener : this) {
- listener.splitChanged(listButton);
- }
- }
}
private static class ListButtonSelectionListenerList extends ListenerList<ListButtonSelectionListener>
@@ -132,7 +125,6 @@ public class ListButton extends Button {
private int selectedIndex = -1;
private Filter<?> disabledItemFilter = null;
private int listSize = -1;
- private boolean split = false;
private String listDataKey = null;
private BindType listDataBindType = BindType.BOTH;
@@ -390,26 +382,6 @@ public class ListButton extends Button {
}
}
- /**
- * Returns the list button's split state.
- */
- public boolean isSplit() {
- return split;
- }
-
- /**
- * Sets the list button's split state. A split list button only shows the list view popup
- * when the trigger part of the button is clicked.
- *
- * @param split
- */
- public void setSplit(boolean split) {
- if (this.split != split) {
- this.split = split;
- listButtonListeners.splitChanged(this);
- }
- }
-
public String getListDataKey() {
return listDataKey;
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java?rev=936508&r1=936507&r2=936508&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ListButtonListener.java Wed Apr 21 21:03:17 2010
@@ -42,10 +42,6 @@ public interface ListButtonListener {
@Override
public void listSizeChanged(ListButton listButton, int previousListSize) {
}
-
- @Override
- public void splitChanged(ListButton listButton) {
- }
}
/**
@@ -79,11 +75,4 @@ public interface ListButtonListener {
* @param previousListSize
*/
public void listSizeChanged(ListButton listButton, int previousListSize);
-
- /**
- * Called when a list button's split state has changed.
- *
- * @param listButton
- */
- public void splitChanged(ListButton listButton);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java?rev=936508&r1=936507&r2=936508&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ListButtonSkin.java Wed Apr 21 21:03:17 2010
@@ -350,11 +350,6 @@ public abstract class ListButtonSkin ext
// No-op
}
- @Override
- public void splitChanged(ListButton listButton) {
- invalidateComponent();
- }
-
// List button selection events
@Override
public void selectedIndexChanged(ListButton listButton, int previousSelectedIndex) {