test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-02 04:07:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify numberpicker,add longclick's auto increment/decrement support

Browse Source
This commit is contained in:
侯歌 2021-10-12 13:40:38 +08:00
parent 213385a316
commit 01ff092f7b
3 changed files with 145 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/samples/numpicker1.cc Executable file
View File

@ -0,0 +1,20 @@
#include <windows.h>
int main(int argc,const char*argv[]){
App app(argc,argv);
Window*w=new Window(0,0,1280,600);
LinearLayout*layout=new LinearLayout(1280,600);
layout->setOrientation(LinearLayout::VERTICAL);
NumberPicker*np1=new NumberPicker(200,80);
np1->setMinValue(1);
np1->setMaxValue(12);
np1->setMinHeight(80);
np1->setBackgroundColor(0xFF111111);
layout->addView(np1);
w->addView(layout);
w->requestLayout();
app.exec();
}

114
src/gui/widget/numberpicker.cc
View File

@ -11,20 +11,26 @@ NumberPicker::NumberPicker(int w,int h):LinearLayout(w,h){
initView();
setOrientation(VERTICAL);//HORIZONTAL);
/*mDecrementButton=new ImageButton(30,20);
if(!mHasSelectorWheel){
mDecrementButton=new ImageButton(30,20);
mDecrementButton->setMinimumHeight(20);
addView(mDecrementButton,new LayoutParams(LayoutParams::WRAP_CONTENT,LayoutParams::WRAP_CONTENT));
mDecrementButton->setOnClickListener(std::bind(&NumberPicker::onIncDecClick,this,std::placeholders::_1));
mDecrementButton->setOnLongClickListener(std::bind(&NumberPicker::onIncDecLongClick,this,std::placeholders::_1));*/
mDecrementButton->setOnLongClickListener(std::bind(&NumberPicker::onIncDecLongClick,this,std::placeholders::_1));
}
mInputText =new EditText("123",20,20);
mInputText->setGravity(Gravity::CENTER);
mInputText->setTextSize(24);
addView(mInputText,new LayoutParams(LayoutParams::MATCH_PARENT,LayoutParams::WRAP_CONTENT));
/*mIncrementButton=new ImageButton(30,20);
if(!mHasSelectorWheel){
mIncrementButton=new ImageButton(30,20);
mIncrementButton->setMinimumHeight(20);
addView(mIncrementButton,new LayoutParams(LayoutParams::WRAP_CONTENT,LayoutParams::WRAP_CONTENT));
mIncrementButton->setOnClickListener(std::bind(&NumberPicker::onIncDecClick,this,std::placeholders::_1));
mIncrementButton->setOnLongClickListener(std::bind(&NumberPicker::onIncDecLongClick,this,std::placeholders::_1));*/
mIncrementButton->setOnLongClickListener(std::bind(&NumberPicker::onIncDecLongClick,this,std::placeholders::_1));
}
}
NumberPicker::NumberPicker(Context* context,const AttributeSet& atts):LinearLayout(context,atts){
@ -81,6 +87,7 @@ NumberPicker::NumberPicker(Context* context,const AttributeSet& atts):LinearLayo
void NumberPicker::onIncDecClick(View&v){
hideSoftInput();
LOGD("onclick %p",&v);
mInputText->clearFocus();
if (&v == mIncrementButton) {
changeValueByOne(true);
@ -115,8 +122,13 @@ void NumberPicker::initView(){
mVirtualButtonPressedDrawable =nullptr;
mLastHandledDownDpadKeyCode =-1;
mHasSelectorWheel = true;
mWrapSelectorWheel= false;
mWrapSelectorWheelPreferred =true;
mSelectionDividerHeight =1;
mPreviousScrollerY =0;
mCurrentScrollOffset =0;
mInitialScrollOffset =0;
mLongPressUpdateInterval = DEFAULT_LONG_PRESS_UPDATE_INTERVAL;
mMinHeight = SIZE_UNSPECIFIED;
mMaxHeight = SIZE_UNSPECIFIED;
mMinWidth = SIZE_UNSPECIFIED;
@ -215,11 +227,11 @@ bool NumberPicker::onInterceptTouchEvent(MotionEvent& event){
// Handle pressed state before any state change.
if (mLastDownEventY < mTopSelectionDividerTop) {
if (mScrollState == OnScrollListener::SCROLL_STATE_IDLE) {
//mPressedStateHelper.buttonPressDelayed(PressedStateHelper.BUTTON_DECREMENT);
pshButtonPressDelayed(BUTTON_DECREMENT);
}
} else if (mLastDownEventY > mBottomSelectionDividerBottom) {
if (mScrollState == OnScrollListener::SCROLL_STATE_IDLE) {
//mPressedStateHelper.buttonPressDelayed(PressedStateHelper.BUTTON_INCREMENT);
pshButtonPressDelayed(BUTTON_INCREMENT);
}
}
// Make sure we support flinging inside scrollables.
@ -277,7 +289,7 @@ bool NumberPicker::onTouchEvent(MotionEvent& event){
case MotionEvent::ACTION_UP: {
removeBeginSoftInputCommand();
removeChangeCurrentByOneFromLongPress();
//mPressedStateHelper.cancel();
pshCancel();//mPressedStateHelper.cancel();
//VelocityTracker* velocityTracker = mVelocityTracker;
mVelocityTracker->computeCurrentVelocity(1000, mMaximumFlingVelocity);
int initialVelocity = (int) mVelocityTracker->getYVelocity();
@ -298,10 +310,10 @@ bool NumberPicker::onTouchEvent(MotionEvent& event){
- SELECTOR_MIDDLE_ITEM_INDEX;
if (selectorIndexOffset > 0) {
changeValueByOne(true);
//mPressedStateHelper.buttonTapped(PressedStateHelper.BUTTON_INCREMENT);
pshButtonTapped(BUTTON_INCREMENT);
} else if (selectorIndexOffset < 0) {
changeValueByOne(false);
//mPressedStateHelper.buttonTapped(PressedStateHelper.BUTTON_DECREMENT);
pshButtonTapped(BUTTON_DECREMENT);
}
}
} else {
@ -715,7 +727,7 @@ void NumberPicker::setValueInternal(int current, bool notifyChng){
}
void NumberPicker::changeValueByOne(bool increment){
LOGD("mHasSelectorWheel=%d",mHasSelectorWheel);
LOGV("mHasSelectorWheel=%d",mHasSelectorWheel);
if (mHasSelectorWheel) {
hideSoftInput();
if (!moveToFinalScrollerPosition(mFlingScroller)) {
@ -873,19 +885,32 @@ void NumberPicker::notifyChange(int previous, int current){
}
void NumberPicker::postChangeCurrentByOneFromLongPress(bool increment, long delayMillis){
if(mChangeCurrentByOneFromLongPressCommand!=nullptr)
removeCallbacks(mChangeCurrentByOneFromLongPressCommand);
mChangeCurrentByOneFromLongPressCommand=[this,increment](){
changeValueByOne(increment);
postDelayed(mChangeCurrentByOneFromLongPressCommand, mLongPressUpdateInterval);
};
postDelayed(mChangeCurrentByOneFromLongPressCommand, delayMillis);
}
void NumberPicker::removeChangeCurrentByOneFromLongPress(){
/*if (mChangeCurrentByOneFromLongPressCommand != nullptr) {
if (mChangeCurrentByOneFromLongPressCommand != nullptr) {
removeCallbacks(mChangeCurrentByOneFromLongPressCommand);
}*/
mChangeCurrentByOneFromLongPressCommand =nullptr;
}
}
void NumberPicker::removeBeginSoftInputCommand(){
}
void NumberPicker::removeAllCallbacks(){
if (mChangeCurrentByOneFromLongPressCommand != nullptr) {
removeCallbacks(mChangeCurrentByOneFromLongPressCommand);
mChangeCurrentByOneFromLongPressCommand =nullptr;
}
pshCancel();
}
int NumberPicker::getSelectedPos(const std::string& value){
@ -919,4 +944,69 @@ bool NumberPicker::ensureScrollWheelAdjusted() {
}
return false;
}
void NumberPicker::pshCancel(){
mPSHMode =0;
mPSHManagedButton=0;
if(mPressedStateHelpers!=nullptr){
removeCallbacks(mPressedStateHelpers);
invalidate(0, mBottomSelectionDividerBottom, mRight-mLeft, mBottom-mTop);
}
mPressedStateHelpers =[this](){
pshRun();
};
mDecrementVirtualButtonPressed =false;
if(mDecrementVirtualButtonPressed)
invalidate(0,0,mRight-mLeft,mTopSelectionDividerTop);
}
void NumberPicker::pshButtonPressDelayed(int button){
pshCancel();
mPSHMode =MODE_PRESS;
mPSHManagedButton =button;
postDelayed(mPressedStateHelpers,ViewConfiguration::getTapTimeout());
}
void NumberPicker::pshButtonTapped(int button){
pshCancel();
mPSHMode =MODE_TAPPED;
mPSHManagedButton=button;
post(mPressedStateHelpers);
}
void NumberPicker::pshRun(){
switch (mPSHMode) {
case MODE_PRESS:
switch (mPSHManagedButton) {
case BUTTON_INCREMENT:
mIncrementVirtualButtonPressed = true;
invalidate(0, mBottomSelectionDividerBottom, mRight, mBottom);
break;
case BUTTON_DECREMENT:
mDecrementVirtualButtonPressed = true;
invalidate(0, 0, mRight, mTopSelectionDividerTop);
break;
}
break;
case MODE_TAPPED:
switch (mPSHManagedButton) {
case BUTTON_INCREMENT:
if (!mIncrementVirtualButtonPressed) {
postDelayed(mPressedStateHelpers,ViewConfiguration::getPressedStateDuration());
}
mIncrementVirtualButtonPressed ^= true;
invalidate(0, mBottomSelectionDividerBottom, mRight, mBottom);
break;
case BUTTON_DECREMENT:
if (!mDecrementVirtualButtonPressed) {
postDelayed(mPressedStateHelpers,ViewConfiguration::getPressedStateDuration());
}
mDecrementVirtualButtonPressed ^= true;
invalidate(0, 0, mRight, mTopSelectionDividerTop);
}//endof switch (mManagedButton)
break;/*endof case MODE_TAPPED*/
}
}
}//namespace

18
src/gui/widget/numberpicker.h
View File

@ -20,7 +20,12 @@ public:
std::function<void(NumberPicker&,int)>onScrollStateChange;
};
private:
static constexpr int BUTTON_INCREMENT =1;
static constexpr int BUTTON_DECREMENT =2;
static constexpr int MODE_PRESS =1;
static constexpr int MODE_TAPPED=2;
static constexpr int SELECTOR_WHEEL_ITEM_COUNT =3;
static constexpr int DEFAULT_LONG_PRESS_UPDATE_INTERVAL =300;
static constexpr int SELECTOR_MIDDLE_ITEM_INDEX = SELECTOR_WHEEL_ITEM_COUNT / 2;
static constexpr int SELECTOR_MAX_FLING_VELOCITY_ADJUSTMENT =8;
static constexpr int SELECTOR_ADJUSTMENT_DURATION_MILLIS =800;
@ -32,6 +37,7 @@ private:
ImageButton* mIncrementButton;
ImageButton* mDecrementButton;
EditText* mInputText;
Runnable mChangeCurrentByOneFromLongPressCommand;
int mSelectionDividersDistance;
int mMinHeight;
int mMaxHeight;
@ -80,6 +86,16 @@ private:
int mLastHandledDownDpadKeyCode = -1;
bool mHideWheelUntilFocused;
bool mWrapSelectorWheelPreferred=true;
//PressedStateHelper's members
Runnable mPressedStateHelpers;
int mPSHManagedButton;
int mPSHMode;
void pshCancel();
void pshButtonPressDelayed(int);
void pshButtonTapped(int);
void pshRun();
private:
void initView();
int makeMeasureSpec(int measureSpec, int maxSize);
@ -129,7 +145,7 @@ public:
bool onTouchEvent(MotionEvent& event)override;
bool dispatchTouchEvent(MotionEvent& event)override;
bool dispatchKeyEvent(KeyEvent& event)override;
void computeScroll();
void computeScroll()override;
View& setEnabled(bool enabled)override;
void scrollBy(int x, int y)override;
int getSolidColor()const;