This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit 692eb501 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

650D, 700D, EOSM: fix interference between ML menu and Canon overlays in LiveView

https://www.magiclantern.fm/forum/index.php?topic=7473.msg198464#msg198464
https://www.magiclantern.fm/forum/index.php?topic=9741.msg205361#msg205361

--HG--
branch : lua_fix
parent c1eb1d236acb
......@@ -154,7 +154,7 @@
// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 90 : 2) // any from 88...98 ?!
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 91 : 2) // any from 88...98 ?!
#define NUM_PICSTYLES 10
#define FLASH_MAX_EV 3
......
......@@ -154,7 +154,7 @@
// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 90 : 2) // any from 88...98 ?!
#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 91 : 2) // any from 88...98 ?!
#define NUM_PICSTYLES 10
#define FLASH_MAX_EV 3
......
......@@ -104,7 +104,7 @@
// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
//~ #define GUIMODE_ML_MENU (recording ? 0 : lv ? 90 : 2) // any from 90...102 ?!
#define GUIMODE_ML_MENU ( RECORDING_H264 ? 99 : 90 ) // any from 90...102 ?!
#define GUIMODE_ML_MENU ( RECORDING_H264 ? 99 : 91 ) // any from 90...102 ?!
// for displaying TRAP FOCUS msg outside LV
#define DISPLAY_TRAP_FOCUS_POS_X 50
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment