[Bf-blender-cvs] [45397af] HMD_viewport: Some hacks to disallow toggeling out of fullscreen in an HMD window

Julian Eisel noreply at git.blender.org
Mon Mar 28 23:03:05 CEST 2016


Commit: 45397af24a140ba3851d8bdc47f5264b709a2bbe
Author: Julian Eisel
Date:   Mon Mar 28 23:01:33 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB45397af24a140ba3851d8bdc47f5264b709a2bbe

Some hacks to disallow toggeling out of fullscreen in an HMD window

===================================================================

M	source/blender/editors/screen/screen_ops.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index be421d7..b6258c7 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2441,6 +2441,11 @@ static void SCREEN_OT_screen_set(wmOperatorType *ot)
 
 /* ************** screen full-area operator ***************************** */
 
+static int screen_maximize_area_poll(bContext *C)
+{
+	wmWindowManager *wm = CTX_wm_manager(C);
+	return ED_operator_areaactive(C) && !(wm->win_hmd && wm->win_hmd == CTX_wm_window(C));
+}
 
 /* function to be called outside UI context, or for redo */
 static int screen_maximize_area_exec(bContext *C, wmOperator *op)
@@ -2484,7 +2489,7 @@ static void SCREEN_OT_screen_full_area(wmOperatorType *ot)
 	ot->idname = "SCREEN_OT_screen_full_area";
 	
 	ot->exec = screen_maximize_area_exec;
-	ot->poll = ED_operator_areaactive;
+	ot->poll = screen_maximize_area_poll;
 	ot->flag = 0;
 
 	prop = RNA_def_boolean(ot->srna, "use_hide_panels", false, "Hide Panels", "Hide all the panels");
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0988cbc..6f2ee01 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -5595,6 +5595,7 @@ void wm_window_keymap(wmKeyConfig *keyconf)
 	RNA_boolean_set(kmi->ptr, "copy", true);
 
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_ALT, 0);
+	kmi = WM_keymap_add_item(keymap, "WM_OT_hmd_view_toggle", EVT_ACTIONZONE_FULLSCREEN, 0, 0, 0);
 	WM_keymap_add_item(keymap, "WM_OT_quit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
 
 	WM_keymap_add_item(keymap, "WM_OT_doc_view_manual_ui_context", F1KEY, KM_PRESS, KM_ALT, 0);
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 7d91e94..4cdb34c 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -768,12 +768,13 @@ void WM_window_fullscreen_toggle(const wmWindow *win, const bool force_full, con
 /* fullscreen operator callback */
 int wm_window_fullscreen_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	wmWindow *window = CTX_wm_window(C);
+	wmWindowManager *wm = CTX_wm_manager(C);
+	wmWindow *win = CTX_wm_window(C);
 
-	if (G.background)
+	if (G.background || win == wm->win_hmd)
 		return OPERATOR_CANCELLED;
 
-	WM_window_fullscreen_toggle(window, false, false);
+	WM_window_fullscreen_toggle(win, false, false);
 
 	return OPERATOR_FINISHED;
 }




More information about the Bf-blender-cvs mailing list