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

setAlphaSliderVisible() bug fixed #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

setAlphaSliderVisible() bug fixed #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 33 additions & 2 deletions library/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public class ColorPickerView extends View {
* Trackers can extend outside slightly,
* due to the required padding we have set.
*/
private Rect drawingRect;
private Rect drawingRect=new Rect();

private Rect satValRect;
private Rect hueRect;
Expand Down Expand Up @@ -729,7 +729,7 @@ private int getPreferredHeight() {
return Math.max(super.getPaddingRight(), mRequiredPadding);
}

@Override protected void onSizeChanged(int w, int h, int oldw, int oldh) {
/*@Override protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);

drawingRect = new Rect();
Expand All @@ -747,6 +747,33 @@ private int getPreferredHeight() {
satValBackgroundCache = null;
hueBackgroundCache = null;

setUpSatValRect();
setUpHueRect();
setUpAlphaRect();
}*/

@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);

int w=getWidth();
int h=getHeight();

// drawingRect = new Rect();
drawingRect.left = getPaddingLeft();
drawingRect.right = w - getPaddingRight();
drawingRect.top = getPaddingTop();
drawingRect.bottom = h - getPaddingBottom();

//The need to be recreated because they depend on the size of the view.
valShader = null;
satShader = null;
alphaShader = null;

// Clear those bitmap caches since the size may have changed.
satValBackgroundCache = null;
hueBackgroundCache = null;

setUpSatValRect();
setUpHueRect();
setUpAlphaRect();
Expand Down Expand Up @@ -878,6 +905,10 @@ public void setAlphaSliderVisible(boolean visible) {
}
}

public boolean getAlphaSliderVisible(){
return showAlphaPanel;
}

/**
* Get color of the tracker slider on the hue and alpha panel.
*
Expand Down