asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

having active items is pointless in input map

Browse source
This commit is contained in:
Juan Linietsky 2016-01-03 18:52:42 -03:00
parent e8fbf39f88
commit 908f75c23f
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/unix/semaphore_posix.cpp
View file

@ -42,7 +42,7 @@ Error SemaphorePosix::wait() {
errno=0;
continue;
} else {
perror("sem waiting");
perror("sem waiting");
return ERR_BUSY;
}
}

12
platform/x11/os_x11.cpp
View file

@ -619,6 +619,7 @@ void OS_X11::set_wm_fullscreen(bool p_enabled) {
xev.xclient.data.l[2] = 0;
XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
}
int OS_X11::get_screen_count() const {
@ -887,7 +888,16 @@ void OS_X11::set_window_maximized(bool p_enabled) {
XGetWindowAttributes(x11_display,DefaultRootWindow(x11_display),&xwa);
current_videomode.width = xwa.width;
current_videomode.height = xwa.height;
*/
//*/
// current_videomode.width = wm_max_horz;
// current_videomode.height = wm_max_vert;
//Size2 ss = get_screen_size(get_current_screen());
//current_videomode.width=ss.width;
//current_videomode.height=ss.height;
maximized = p_enabled;
}

6
tools/editor/project_settings.cpp
View file

@ -107,6 +107,8 @@ void ProjectSettings::_action_persist_toggle() {
String name="input/"+ti->get_text(0);
bool prev = Globals::get_singleton()->is_persisting(name);
print_line("prev persist: "+itos(prev));
print_line("new persist: "+itos(ti->is_checked(0)));
if (prev==ti->is_checked(0))
return;
@ -428,7 +430,7 @@ void ProjectSettings::_update_actions() {
continue;
TreeItem *item=input_editor->create_item(root);
item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
//item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
item->set_text(0,name);
item->add_button(0,get_icon("Add","EditorIcons"),1);
if (!Globals::get_singleton()->get_input_presets().find(pi.name)) {
@ -437,7 +439,7 @@ void ProjectSettings::_update_actions() {
}
item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
item->set_editable(0,true);
item->set_checked(0,pi.usage&PROPERTY_USAGE_CHECKED);
//item->set_checked(0,pi.usage&PROPERTY_USAGE_CHECKED);