params: toggle_hud_position

pull/873/head
FlightlessMango 1 year ago
parent 61596104ce
commit 7dee12a75a

@ -73,4 +73,10 @@ void check_keybinds(struct overlay_params& params, uint32_t vendorID){
last_upload_press = now;
logger->upload_last_logs();
}
if (elapsedF12 >= keyPressDelay &&
keys_are_pressed(params.toggle_hud_position)) {
next_hud_position(params);
last_f12_press = now;
}
}

@ -359,6 +359,8 @@ void position_layer(struct swapchain_stats& data, const struct overlay_params& p
data.main_window_pos = ImVec2((width / 2) - (window_size.x / 2), margin + params.offset_y);
ImGui::SetNextWindowPos(data.main_window_pos, ImGuiCond_Always);
break;
case LAYER_POSITION_COUNT:
break;
}
}
@ -927,3 +929,11 @@ void update_fan(){
else
fan_speed = -1;
}
void next_hud_position(struct overlay_params& params){
if (params.position < (overlay_param_position::LAYER_POSITION_COUNT - 1)){
params.position = static_cast<overlay_param_position>(params.position + 1);
} else {
params.position = static_cast<overlay_param_position>(0);
}
}

@ -121,5 +121,6 @@ extern int global_control_client;
void render_mpris_metadata(const overlay_params& params, mutexed_metadata& meta, uint64_t frame_timing);
#endif
void update_fan();
void next_hud_position(struct overlay_params& params);
#endif //MANGOHUD_OVERLAY_H

@ -144,20 +144,22 @@ parse_string_to_keysym_vec(const char *str)
return keys;
}
#define parse_toggle_hud parse_string_to_keysym_vec
#define parse_toggle_logging parse_string_to_keysym_vec
#define parse_reload_cfg parse_string_to_keysym_vec
#define parse_upload_log parse_string_to_keysym_vec
#define parse_upload_logs parse_string_to_keysym_vec
#define parse_toggle_fps_limit parse_string_to_keysym_vec
#define parse_toggle_hud parse_string_to_keysym_vec
#define parse_toggle_hud_position parse_string_to_keysym_vec
#define parse_toggle_logging parse_string_to_keysym_vec
#define parse_reload_cfg parse_string_to_keysym_vec
#define parse_upload_log parse_string_to_keysym_vec
#define parse_upload_logs parse_string_to_keysym_vec
#define parse_toggle_fps_limit parse_string_to_keysym_vec
#else
#define parse_toggle_hud(x) {}
#define parse_toggle_logging(x) {}
#define parse_reload_cfg(x) {}
#define parse_upload_log(x) {}
#define parse_upload_logs(x) {}
#define parse_toggle_fps_limit(x) {}
#define parse_toggle_hud(x) {}
#define parse_toggle_hud_position(x) {}
#define parse_toggle_logging(x) {}
#define parse_reload_cfg(x) {}
#define parse_upload_log(x) {}
#define parse_upload_logs(x) {}
#define parse_toggle_fps_limit(x) {}
#endif
static uint32_t
@ -637,6 +639,7 @@ parse_overlay_config(struct overlay_params *params,
#ifdef HAVE_X11
params->toggle_hud = { XK_Shift_R, XK_F12 };
params->toggle_hud_position = { XK_Shift_R, XK_F11 };
params->toggle_fps_limit = { XK_Shift_L, XK_F1 };
params->toggle_logging = { XK_Shift_L, XK_F2 };
params->reload_cfg = { XK_Shift_L, XK_F4 };

@ -111,6 +111,7 @@ typedef unsigned long KeySym;
OVERLAY_PARAM_CUSTOM(gl_bind_framebuffer) \
OVERLAY_PARAM_CUSTOM(gl_dont_flip) \
OVERLAY_PARAM_CUSTOM(toggle_hud) \
OVERLAY_PARAM_CUSTOM(toggle_hud_position) \
OVERLAY_PARAM_CUSTOM(toggle_fps_limit) \
OVERLAY_PARAM_CUSTOM(toggle_logging) \
OVERLAY_PARAM_CUSTOM(reload_cfg) \
@ -162,12 +163,14 @@ typedef unsigned long KeySym;
enum overlay_param_position {
LAYER_POSITION_TOP_LEFT,
LAYER_POSITION_TOP_CENTER,
LAYER_POSITION_TOP_RIGHT,
LAYER_POSITION_MIDDLE_LEFT,
LAYER_POSITION_MIDDLE_RIGHT,
LAYER_POSITION_BOTTOM_LEFT,
LAYER_POSITION_BOTTOM_RIGHT,
LAYER_POSITION_TOP_CENTER,
// Count must always be the last entry
LAYER_POSITION_COUNT,
};
enum overlay_plots {
@ -243,6 +246,7 @@ struct overlay_params {
std::vector<KeySym> reload_cfg;
std::vector<KeySym> upload_log;
std::vector<KeySym> upload_logs;
std::vector<KeySym> toggle_hud_position;
std::string time_format, output_folder, output_file;
std::string pci_dev;
std::string media_player_name;

Loading…
Cancel
Save