|
@@ -1458,23 +1458,24 @@ void lauidetached_GameController(laPanel* p){
|
|
|
la_MakeDetachedProp(p, "la.controllers", "controllers");
|
|
|
}
|
|
|
void laui_InputMapper(laUiList *uil, laPropPack *This, laPropPack *Extra, laColumn *UNUSED, int context){
|
|
|
- laColumn* c=laFirstColumn(uil),*cl, *cr;
|
|
|
- laSplitColumn(uil,c,0.6); cl=laLeftColumn(c,0); cr=laRightColumn(c,0);
|
|
|
-
|
|
|
- laUiItem* b=laBeginRow(uil,cl,0,0);
|
|
|
- laUiItem* b2=laOnConditionThat(uil,cl,laPropExpression(0,"la.input_mapping.pages"));{
|
|
|
- laUiItem* b3=laOnConditionThat(uil,cl,laPropExpression(0,"la.input_mapping.current_page"));{
|
|
|
- laShowItem(uil,cr,0,"la.input_mapping.current_page.name")->Expand=1;
|
|
|
- laShowItem(uil,c,Extra,"LA_input_mapping_rebuild")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
- }laEndCondition(uil,b3);
|
|
|
- }laEndCondition(uil,b2);
|
|
|
- laShowItem(uil,cl,0,"LA_add_input_mapping_page")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
+ laColumn* c=laFirstColumn(uil);
|
|
|
+ laUiItem* b=laBeginRow(uil,c,0,0);
|
|
|
+ laShowItemFull(uil,c,0,"la.input_mapping.pages",LA_WIDGET_COLLECTION_SELECTOR,0,0,0)
|
|
|
+ ->Flags|=LA_UI_COLLECTION_SIMPLE_SELECTOR;
|
|
|
+ laUiItem* b3=laOnConditionThat(uil,c,laPropExpression(0,"la.input_mapping.current_page"));{
|
|
|
+ laShowItem(uil,c,0,"la.input_mapping.current_page.name");
|
|
|
+ laShowItem(uil,c,0,"LA_add_input_mapping_page")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
+ laShowItem(uil,c,Extra,"LA_input_mapping_rebuild")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
+ laShowSeparator(uil,c);
|
|
|
+ laUiItem* cp=laShowInvisibleItem(uil,c,0,"la.input_mapping.current_page");
|
|
|
+ laShowItem(uil,c,&cp->PP,"remove_input_mapping_page")->Flags|=LA_UI_FLAGS_ICON;;
|
|
|
+ }laElse(uil,b3);{
|
|
|
+ laShowItem(uil,c,0,"LA_add_input_mapping_page");
|
|
|
+ }laEndCondition(uil,b3);
|
|
|
laEndRow(uil,b);
|
|
|
- b2=laOnConditionThat(uil,cr,laPropExpression(0,"la.input_mapping.pages"));{
|
|
|
- laShowItemFull(uil,cr,0,"la.input_mapping.pages",LA_WIDGET_COLLECTION_SELECTOR,0,0,0);
|
|
|
- }laEndCondition(uil,b2);
|
|
|
-
|
|
|
- laShowItemFull(uil,c,0,"la.input_mapping.current_page",LA_WIDGET_COLLECTION_SINGLE,0,laui_RackPage,0)->Flags|=LA_UI_FLAGS_NO_DECAL;
|
|
|
+ b3=laOnConditionThat(uil,c,laPropExpression(0,"la.input_mapping.current_page"));{
|
|
|
+ laShowItemFull(uil,c,0,"la.input_mapping.current_page",LA_WIDGET_COLLECTION_SINGLE,0,laui_RackPage,0)->Flags|=LA_UI_FLAGS_NO_DECAL;
|
|
|
+ }laEndCondition(uil,b3);
|
|
|
}
|
|
|
void lauidetached_Drivers(laPanel* p){
|
|
|
la_MakeDetachedProp(p, "la.detached_view_switch", "detached");
|
|
@@ -1491,13 +1492,14 @@ void laui_Drivers(laUiList *uil, laPropPack *This, laPropPack *Extra, laColumn *
|
|
|
laUiItem* b2=laOnConditionThat(uil,cl,laPropExpression(&rb->PP,""));{\
|
|
|
laUiItem* b=laBeginRow(uil,cr,0,0);\
|
|
|
laUiItem* b3=laOnConditionThat(uil,cl,laPropExpression(&rb->PP,"drivers.current_page"));{\
|
|
|
- laShowItemFull(uil,cr,&rb->PP,"drivers.current_page",LA_WIDGET_COLLECTION_SELECTOR,0,laui_IdentifierOnly,0)\
|
|
|
- ->Flags|=LA_UI_COLLECTION_SIMPLE_SELECTOR;\
|
|
|
- laShowItem(uil,cr,&rb->PP,"drivers.current_page.name");\
|
|
|
+ laUiItem* cp=laShowItemFull(uil,cr,&rb->PP,"drivers.current_page",LA_WIDGET_COLLECTION_SELECTOR,0,laui_IdentifierOnly,0);\
|
|
|
+ cp->Flags|=LA_UI_COLLECTION_SIMPLE_SELECTOR;\
|
|
|
+ laShowItem(uil,cr,&cp->PP,"name");\
|
|
|
laShowItem(uil,cr,&rb->PP,"add_driver_page")->Flags|=LA_UI_FLAGS_ICON;\
|
|
|
+ laShowItem(uil,cr,&cp->PP,"remove_driver_page")->Flags|=LA_UI_FLAGS_ICON;\
|
|
|
laShowSeparator(uil,cr);\
|
|
|
- laShowItem(uil,cr,&rb->PP,"drivers.current_page.trigger");\
|
|
|
- laShowItemFull(uil,cr,&rb->PP,"drivers.current_page.use_script",0,"icon=📃",0,0)\
|
|
|
+ laShowItem(uil,cr,&cp->PP,"trigger");\
|
|
|
+ laShowItemFull(uil,cr,&cp->PP,"use_script",0,"icon=📃",0,0)\
|
|
|
->Flags|=LA_UI_FLAGS_HIGHLIGHT|LA_UI_FLAGS_CYCLE|LA_UI_FLAGS_ICON;\
|
|
|
}laElse(uil,b3);{\
|
|
|
laShowItem(uil,cr,&rb->PP,"add_driver_page")->Flags|=LA_UI_FLAGS_ICON;\
|