Revision 7cb8d4b0
Added by Leszek Koltunski about 2 years ago
| src/main/java/org/distorted/config/ConfigActivity.java | ||
|---|---|---|
| 35 | 35 |
import org.distorted.objectlib.main.ObjectControl; |
| 36 | 36 |
import org.distorted.main.R; |
| 37 | 37 |
import org.distorted.dialogs.RubikDialogError; |
| 38 |
import org.distorted.objectlib.main.TwistyObject; |
|
| 38 | 39 |
import org.distorted.objects.RubikObject; |
| 39 | 40 |
import org.distorted.objects.RubikObjectList; |
| 40 | 41 |
|
| ... | ... | |
| 208 | 209 |
if( object!=null ) |
| 209 | 210 |
{
|
| 210 | 211 |
int meshState = object.getMeshState(); |
| 212 |
int iconMode = TwistyObject.MODE_NORM; |
|
| 211 | 213 |
InputStream jsonStream = object.getObjectStream(this); |
| 212 | 214 |
InputStream meshStream = object.getMeshStream(this); |
| 213 | 215 |
String name = object.getUpperName(); |
| 214 | 216 |
|
| 215 |
control.changeIfDifferent(ordinal,name,meshState,jsonStream,meshStream); |
|
| 217 |
control.changeIfDifferent(ordinal,name,meshState,iconMode,jsonStream,meshStream);
|
|
| 216 | 218 |
} |
| 217 | 219 |
} |
| 218 | 220 |
|
| ... | ... | |
| 239 | 241 |
ObjectControl control = view.getObjectControl(); |
| 240 | 242 |
|
| 241 | 243 |
int meshState = object.getMeshState(); |
| 244 |
int iconMode = TwistyObject.MODE_NORM; |
|
| 242 | 245 |
InputStream jsonStream = object.getObjectStream(this); |
| 243 | 246 |
InputStream meshStream = object.getMeshStream(this); |
| 244 | 247 |
|
| 245 |
control.changeObject(ordinal,meshState,jsonStream,meshStream); |
|
| 248 |
control.changeObject(ordinal,meshState,iconMode,jsonStream,meshStream);
|
|
| 246 | 249 |
} |
| 247 | 250 |
} |
| 248 | 251 |
|
Also available in: Unified diff
Mode the 'iconMode' from static variable in ObjectControl to member varaible in TwistyObject (safer)