Export immediately if only one device present
(cherry picked from commit 938f9388dd
)
This commit is contained in:
parent
3e127ce3fd
commit
f1c2d70f1a
1 changed files with 17 additions and 6 deletions
|
@ -55,6 +55,7 @@ void EditorRunNative::_notification(int p_what) {
|
||||||
small_icon->create_from_image(im);
|
small_icon->create_from_image(im);
|
||||||
MenuButton *mb = memnew( MenuButton );
|
MenuButton *mb = memnew( MenuButton );
|
||||||
mb->get_popup()->connect("item_pressed",this,"_run_native",varray(E->get()));
|
mb->get_popup()->connect("item_pressed",this,"_run_native",varray(E->get()));
|
||||||
|
mb->connect("pressed",this,"_run_native",varray(-1, E->get()));
|
||||||
mb->set_icon(small_icon);
|
mb->set_icon(small_icon);
|
||||||
add_child(mb);
|
add_child(mb);
|
||||||
menus[E->get()]=mb;
|
menus[E->get()]=mb;
|
||||||
|
@ -79,13 +80,16 @@ void EditorRunNative::_notification(int p_what) {
|
||||||
if (dc==0) {
|
if (dc==0) {
|
||||||
mb->hide();
|
mb->hide();
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
mb->get_popup()->clear();
|
mb->get_popup()->clear();
|
||||||
mb->show();
|
mb->show();
|
||||||
for(int i=0;i<dc;i++) {
|
if (dc == 1) {
|
||||||
|
mb->set_tooltip(eep->get_device_name(0) + "\n\n" + eep->get_device_info(0).strip_edges());
|
||||||
mb->get_popup()->add_icon_item(get_icon("Play","EditorIcons"),eep->get_device_name(i));
|
} else {
|
||||||
mb->get_popup()->set_item_tooltip(mb->get_popup()->get_item_count() -1,eep->get_device_info(i));
|
mb->set_tooltip("Select device from the list");
|
||||||
|
for(int i=0;i<dc;i++) {
|
||||||
|
mb->get_popup()->add_icon_item(get_icon("Play","EditorIcons"),eep->get_device_name(i));
|
||||||
|
mb->get_popup()->set_item_tooltip(mb->get_popup()->get_item_count() -1,eep->get_device_info(i).strip_edges());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -96,11 +100,18 @@ void EditorRunNative::_notification(int p_what) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
|
void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
|
||||||
|
|
||||||
Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
|
Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
|
||||||
ERR_FAIL_COND(eep.is_null());
|
ERR_FAIL_COND(eep.is_null());
|
||||||
|
if (p_idx == -1) {
|
||||||
|
if (eep->get_device_count() == 1) {
|
||||||
|
menus[p_platform]->get_popup()->hide();
|
||||||
|
p_idx = 0;
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
emit_signal("native_run");
|
emit_signal("native_run");
|
||||||
|
|
||||||
int flags=0;
|
int flags=0;
|
||||||
|
|
Loading…
Reference in a new issue