Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Common - Hide cursor during progress bar #9128

Merged
merged 3 commits into from
Jan 24, 2023
Merged

Common - Hide cursor during progress bar #9128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0d83ea
Common - Hide cursor during progress bar (w/ CBA setting)
JonBons Jan 23, 2023
167d0dc
Fix base class define
PabstMirror Jan 23, 2023
92ed5e2
Removed CBA setting for disabling hiding of the cursor for the ACE pr…
JonBons Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addons/common/DisableMouseDialog.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class ctrlMapEmpty;
class GVAR(DisableMouse_Dialog) {
idd = -1;
movingEnable = 0;
Expand Down
11 changes: 6 additions & 5 deletions addons/common/ProgressScreen.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
class GVAR(ProgressBar_Dialog) {
idd = -1;
movingEnable = 0;
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBG)),(_this select 0) displayCtrl 1)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBar)),(_this select 0) displayCtrl 2)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBarTitle)),(_this select 0) displayCtrl 3)];);
onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgProgress)),_this select 0)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBG)),(_this select 0) displayCtrl 1)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBar)),(_this select 0) displayCtrl 2)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBarTitle)),(_this select 0) displayCtrl 3)];);
objects[] = {};

class controlsBackground {
class Background {
idc = -1;
class Background: ctrlMapEmpty {
idc = 101;
moving = 0;
fade = 1;
font = "TahomaB";
text = "";
sizeEx = 0;
lineSpacing = 0;
type = 0;
style = 0;
style = 48;
type = 101;
size = 1;
colorBackground[] = {0, 0, 0, 0.0};
colorText[] = {0, 0, 0, 0};
Expand Down
2 changes: 2 additions & 0 deletions addons/common/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class ACE_Rsc_Control_Base {
h = 0;
};

class ctrlMapEmpty;

#include "ACE_Settings.hpp"
#include "define.hpp"
#include "ProgressScreen.hpp"
Expand Down
5 changes: 5 additions & 0 deletions addons/common/functions/fnc_progressBar.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ private _player = ACE_player;
closeDialog 0;
createDialog QGVAR(ProgressBar_Dialog);

// Hide cursor by using custom transparent cursor
private _display = uiNamespace getVariable QGVAR(dlgProgress);
private _map = _display displayCtrl 101;
_map ctrlMapCursor ["", QGVAR(blank)];

(uiNamespace getVariable QGVAR(ctrlProgressBarTitle)) ctrlSetText _localizedTitle;

//Adjust position based on user setting:
Expand Down