Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Tab.java #77

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update Tab.java #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1506b77
Update Tab.java
GoToLoop Jul 15, 2016
e716ec6
Update Tab.java
GoToLoop Jul 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 36 additions & 66 deletions src/controlP5/Tab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
package controlP5;

/**
* controlP5 is a processing gui library.
*
Expand All @@ -25,6 +23,8 @@
*
*/

package controlP5;

import processing.core.PGraphics;

/**
Expand All @@ -42,8 +42,6 @@ public class Tab extends ControllerGroup< Tab > {
protected boolean isActive = false;
private boolean isAlwaysActive = false;
protected boolean isEventActive = false;
protected float _myValue = 0;
protected String _myStringValue = "";
public static int padding = 4;
public boolean autoWidth = true;

Expand All @@ -55,10 +53,8 @@ public class Tab extends ControllerGroup< Tab > {
*/
public Tab( ControlP5 theControlP5 , ControlWindow theControlWindow , String theName ) {
super( theControlP5 , null , theName , 0 , 0 );
position = new float[ 2 ];
absolutePosition = new float[ 2 ];
isMoveable = false;
isEventActive = theControlP5.isTabEventsActive;
isEventActive = cp5.isTabEventsActive;
_myHeight = 16;
_myWidth = _myLabel.getWidth( ) + padding * 2;
_myLabel.align( LEFT , CENTER ).setPadding( 0 , 0 );
Expand All @@ -69,26 +65,22 @@ protected void setOffset( int theValueX , int theValueY ) {
_myOffsetY = theValueY;
}

protected int height( ) {
return _myHeight;
@Deprecated protected int height( ) {
return getHeight( );
}

protected boolean updateLabel( ) {
isInside = inside( );
return cp5.getWindow( ).getTabs( ).size( ) > 2;
return getWindow( ).getTabs( ).size( ) > 2;
}

protected void drawLabel( PGraphics theGraphics ) {
if ( autoWidth ) {
_myWidth = _myLabel.getWidth( ) + padding * 2;
}
protected void drawLabel( final PGraphics theGraphics ) {
if ( autoWidth ) _myWidth = _myLabel.getWidth( ) + 2*padding;
theGraphics.pushMatrix( );
theGraphics.pushStyle( );
theGraphics.noStroke( );
theGraphics.fill( isInside ? color.getForeground( ) : color.getBackground( ) );
if ( isActive ) {
theGraphics.fill( color.getActive( ) );
}
if ( isActive ) theGraphics.fill( color.getActive( ) );
theGraphics.translate( _myOffsetX , _myOffsetY );
theGraphics.rect( 0 , 0 , _myWidth - 1 , _myHeight );
_myLabel.draw( theGraphics , padding , 0 , this );
Expand All @@ -103,42 +95,42 @@ protected void drawLabel( PGraphics theGraphics ) {
* @param theLabel String
* @return Tab
*/
public Tab setLabel( String theLabel ) {
_myLabel.set( theLabel );
return this;
}
// public Tab setLabel( String theLabel ) {
// _myLabel.set( theLabel );
// return this;
// }

protected int width( ) {
return _myWidth;
@Deprecated protected int width( ) {
return getWidth( );
}

/**
* @param theWidth
* @return
*/
public Tab setWidth( int theWidth ) {
@Override public T setWidth( int theWidth ) {
_myWidth = theWidth + padding;
autoWidth = false;
return this;
return me;
}

public Tab setHeight( int theHeight ) {
_myHeight = theHeight;
return this;
}
// public Tab setHeight( int theHeight ) {
// _myHeight = theHeight;
// return this;
// }

protected boolean inside( ) {
return ( cp5.getWindow( ).mouseX > _myOffsetX && cp5.getWindow( ).mouseX < _myOffsetX + _myWidth && cp5.getWindow( ).mouseY > _myOffsetY && cp5.getWindow( ).mouseY < _myOffsetY + _myHeight );
@Override protected boolean inside( ) {
final int mx = getWindow( ).mouseX, my = getWindow( ).mouseY;
return mx > _myOffsetX && mx < _myOffsetX + _myWidth &&
my > _myOffsetY && my < _myOffsetY + _myHeight;
}

/**
* {@inheritDoc}
*/
@ControlP5.Invisible public void mousePressed( ) {
cp5.getWindow( ).activateTab( this );
if ( isEventActive ) {
cp5.getControlBroadcaster( ).broadcast( new ControlEvent( this ) , ControlP5Constants.METHOD );
}
@ControlP5.Invisible @Override public void mousePressed( ) {
getWindow( ).activateTab( this );
if ( isEventActive ) cp5.getControlBroadcaster( ).broadcast( new ControlEvent( this ) , METHOD );
}

/**
Expand Down Expand Up @@ -169,18 +161,17 @@ public boolean isAlwaysActive( ) {
return isAlwaysActive;
}

@Override public Tab bringToFront( ) {
cp5.getWindow( ).activateTab( this );
return this;
@Override public T bringToFront( ) {
getWindow( ).activateTab( this );
return me;
}

/**
* {@inheritDoc}
*/
@Override public Tab moveTo( ControlWindow theWindow ) {
cp5.getWindow( ).removeTab( this );
setTab( theWindow , getName( ) );
return this;
@Override public T moveTo( ControlWindow theControlWindow ) {
getWindow( ).removeTab( this );
return setTab( theControlWindow , getName( ) );
}

/**
Expand All @@ -195,34 +186,13 @@ public Tab activateEvent( boolean theFlag ) {
return this;
}

/**
* {@inheritDoc}
*/
@Override public String getStringValue( ) {
return _myStringValue;
}

/**
* {@inheritDoc}
*/
@Override public float getValue( ) {
return _myValue;
}

/**
* {@inheritDoc}
*/
@Override public Tab setValue( float theValue ) {
_myValue = theValue;
return this;
}

@Deprecated public float value( ) {
return _myValue;
return getValue( );
}

@Deprecated public String stringValue( ) {
return _myStringValue;
return getStringValue( );
}

}