Revision 280dc794
Added by Leszek Koltunski over 2 years ago
| src/main/java/org/distorted/config/ConfigScreen.java | ||
|---|---|---|
| 117 | 117 |
if( act.getControl().isUINotBlocked() && mObjectOrdinal!=ordinal ) |
| 118 | 118 |
{
|
| 119 | 119 |
mObjectOrdinal = ordinal; |
| 120 |
act.changeObject(rubikObject);
|
|
| 120 |
act.changeObject(mObjectOrdinal);
|
|
| 121 | 121 |
mMovesText.setText(act.getString(R.string.mo_placeholder,mObjectOrdinal+1,numObjects)); |
| 122 | 122 |
mPane.updatePane(act,mObjectOrdinal); |
| 123 | 123 |
} |
| ... | ... | |
| 241 | 241 |
mObjectOrdinal--; |
| 242 | 242 |
if( mObjectOrdinal<0 ) mObjectOrdinal=numObjects-1; |
| 243 | 243 |
|
| 244 |
RubikObject object = RubikObjectList.getObject(mObjectOrdinal); |
|
| 245 |
act.changeObject(object); |
|
| 246 |
|
|
| 244 |
act.changeObject(mObjectOrdinal); |
|
| 247 | 245 |
mPane.updatePane(act,mObjectOrdinal); |
| 248 | 246 |
} |
| 249 | 247 |
|
| ... | ... | |
| 254 | 252 |
mObjectOrdinal++; |
| 255 | 253 |
if( mObjectOrdinal>=numObjects ) mObjectOrdinal=0; |
| 256 | 254 |
|
| 257 |
RubikObject object = RubikObjectList.getObject(mObjectOrdinal); |
|
| 258 |
act.changeObject(object); |
|
| 259 |
|
|
| 255 |
act.changeObject(mObjectOrdinal); |
|
| 260 | 256 |
mPane.updatePane(act,mObjectOrdinal); |
| 261 | 257 |
} |
| 262 | 258 |
|
Also available in: Unified diff
Improve the behaviour of the Config and Tutorial activities when in the 'PopUpMode'. Also, remember the current object in the COnfig activity so that when we put it to the background and resume - the object stays.