From 18940d0787aaef1aea63579f9dfebf6ff05efc14 Mon Sep 17 00:00:00 2001 From: SzwedzikPL Date: Wed, 3 Jun 2015 06:04:47 +0200 Subject: [PATCH] Interaction menu background options --- addons/interact_menu/ACE_Settings.hpp | 10 +++---- addons/interact_menu/CursorMenus.hpp | 38 +++++++++++++++++++++++++ addons/interact_menu/XEH_clientInit.sqf | 11 +++++-- addons/interact_menu/stringtable.xml | 9 ++++-- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/addons/interact_menu/ACE_Settings.hpp b/addons/interact_menu/ACE_Settings.hpp index 227f73d023..7e7acfcc03 100644 --- a/addons/interact_menu/ACE_Settings.hpp +++ b/addons/interact_menu/ACE_Settings.hpp @@ -69,11 +69,11 @@ class ACE_Settings { isClientSettable = 1; displayName = "$STR_ACE_Interact_Menu_ActionOnKeyRelease"; }; - class GVAR(blurScreen) { + class GVAR(menuBackground) { value = 0; - typeName = "BOOL"; + typeName = "SCALAR"; isClientSettable = 1; - displayName = "$STR_ACE_Interact_Menu_blurScreen"; - description = "$STR_ACE_Interact_Menu_blurScreenDesc"; + displayName = "$STR_ACE_Interact_Menu_background"; + values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_ACE_Interact_Menu_backgroundBlur", "$STR_ACE_Interact_Menu_backgroundBlack"}; }; -}; +}; \ No newline at end of file diff --git a/addons/interact_menu/CursorMenus.hpp b/addons/interact_menu/CursorMenus.hpp index 16ced412ec..4da3dcf7d7 100644 --- a/addons/interact_menu/CursorMenus.hpp +++ b/addons/interact_menu/CursorMenus.hpp @@ -6,3 +6,41 @@ class GVAR(cursorMenu) { onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgCursorMenu)),_this select 0)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),true)]); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),false)]); }; +class RscTitles { + class RscPicture; + class GVAR(menuBackground) { + idd = -1; + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuBackground)),_this select 0)]); + onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(menuBackground)),displayNull)]); + fadeIn = 0.25; + fadeOut = 0.25; + movingEnable = false; + duration = 10e10; + name = QGVAR(menuBackground); + class controls { + class GVAR(menuBackground)_picutre: RscPicture { + idc = -1; + }; + }; + class controlsBackground { + class background { + idc = -1; + moving = 0; + font = "TahomaB"; + text = ""; + sizeEx = 0; + lineSpacing = 0; + access = 0; + type = 0; + style = 0; + size = 1; + colorBackground[] = {0, 0, 0, 0.65}; + colorText[] = {0, 0, 0, 0}; + x = "safezoneX"; + y = "safezoneY"; + w = "safezoneW"; + h = "safezoneH"; + }; + }; + }; +}; diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index 221233e375..d4d27d68a1 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -63,5 +63,12 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; // disable firing while the interact menu is is is opened ["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventHandler); -["interactMenuOpened", { if (GVAR(blurScreen)) then {[QGVAR(blurScreen), true] call EFUNC(common,blurScreen);}; }] call EFUNC(common,addEventHandler); -["interactMenuClosed", { if (GVAR(blurScreen)) then {[QGVAR(blurScreen), false] call EFUNC(common,blurScreen);}; }] call EFUNC(common,addEventHandler); +// background options +["interactMenuOpened", { + if (GVAR(menuBackground)==1) then {[QGVAR(menuBackground), true] call EFUNC(common,blurScreen);}; + if (GVAR(menuBackground)==2) then {0 cutRsc[QGVAR(menuBackground), "PLAIN", 1, false];}; +}] call EFUNC(common,addEventHandler); +["interactMenuClosed", { + if (GVAR(menuBackground)==1) then {[QGVAR(menuBackground), false] call EFUNC(common,blurScreen);}; + if (GVAR(menuBackground)==2) then {(uiNamespace getVariable [QGVAR(menuBackground), displayNull]) closeDisplay 0;}; +}] call EFUNC(common,addEventHandler); diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 2bd9bdbaf3..72b3f432e0 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -217,11 +217,16 @@ Körvonal Contorno - - Blur screen on interaction + + Interaction menu background Blur the background while the interaction menu is open. + + Blur screen + + + Black