cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-04-05 09:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

global GUI shortcuts require ctrl+shift

Browse source
This commit is contained in:
myT 2024-12-28 19:37:53 +01:00
parent 5e6b190223
commit c0beda6450
7 changed files with 45 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/client/cl_imgui.cpp
View file

@ -87,14 +87,17 @@ void TableRow2(const char* item0, float item1, const char* format)
TableRow(2, item0, va(format, item1));
}
bool IsShortcutPressed(ImGuiKey key)
bool IsShortcutPressed(ImGuiKey key, ShortcutOptions::Flags flags)
{
return ImGui::IsKeyDown(ImGuiMod_Ctrl) && ImGui::IsKeyPressed(key, false);
const bool globalShortcut = (flags & ShortcutOptions::Global) != 0;
const bool shiftStateOK = globalShortcut == ImGui::IsKeyDown(ImGuiMod_Shift);
return ImGui::IsKeyDown(ImGuiMod_Ctrl) && shiftStateOK && ImGui::IsKeyPressed(key, false);
}
void ToggleBooleanWithShortcut(bool& value, ImGuiKey key)
void ToggleBooleanWithShortcut(bool& value, ImGuiKey key, ShortcutOptions::Flags flags)
{
if(IsShortcutPressed(key))
if(IsShortcutPressed(key, flags))
{
value = !value;
}

15
code/client/cl_imgui.h
View file

@ -28,14 +28,25 @@ along with Challenge Quake 3. If not, see <https://www.gnu.org/licenses/>.
#include "../implot/implot.h"
// global requires shift key down, local requires shift up
struct ShortcutOptions
{
enum Flags
{
None = 0,
Local = 0,
Global = 1 << 0
};
};
bool BeginTable(const char* name, int count);
void TableHeader(int count, ...);
void TableRow(int count, ...);
void TableRow2(const char* item0, bool item1);
void TableRow2(const char* item0, int item1);
void TableRow2(const char* item0, float item1, const char* format = "%g");
bool IsShortcutPressed(ImGuiKey key);
void ToggleBooleanWithShortcut(bool& value, ImGuiKey key);
bool IsShortcutPressed(ImGuiKey key, ShortcutOptions::Flags flags);
void ToggleBooleanWithShortcut(bool& value, ImGuiKey key, ShortcutOptions::Flags flags);
void RadioButton(int* value, float titleWidth, const char* title, int count, ...); // count (const char* name, int value) pairs
void SaveFileDialog_Open(const char* folder, const char* extension);
bool SaveFileDialog_Do(); // true when the user clicked the save button

4
code/renderer/crp_magnifier.cpp
View file

@ -86,6 +86,6 @@ void Magnifier::Draw()
void Magnifier::DrawGUI()
{
ToggleBooleanWithShortcut(magnifierActive, ImGuiKey_M);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Magnifier", "Ctrl+M", &magnifierActive);
ToggleBooleanWithShortcut(magnifierActive, ImGuiKey_M, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Magnifier", "Ctrl+Shift+M", &magnifierActive);
}

4
code/renderer/grp_world.cpp
View file

@ -736,8 +736,8 @@ void World::DrawGUI()
#endif
static bool active = false;
ToggleBooleanWithShortcut(active, ImGuiKey_W);
GUI_AddMainMenuItem(GUI_MainMenu::Info, "World rendering", "Ctrl+W", &active);
ToggleBooleanWithShortcut(active, ImGuiKey_W, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Info, "World rendering", "Ctrl+Shift+W", &active);
if(active)
{
if(ImGui::Begin("World", &active, ImGuiWindowFlags_AlwaysAutoResize))

4
code/renderer/rhi_d3d12.cpp
View file

@ -3190,8 +3190,8 @@ namespace RHI
static void DrawGUI()
{
static bool resourcesActive = false;
ToggleBooleanWithShortcut(resourcesActive, ImGuiKey_R);
GUI_AddMainMenuItem(GUI_MainMenu::Info, "RHI Resources", "Ctrl+R", &resourcesActive);
ToggleBooleanWithShortcut(resourcesActive, ImGuiKey_R, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Info, "RHI Resources", "Ctrl+Shift+R", &resourcesActive);
if(resourcesActive)
{
if(ImGui::Begin("Direct3D 12 RHI", &resourcesActive))

8
code/renderer/srp_main.cpp
View file

@ -363,8 +363,8 @@ void SRP::DrawGUI()
}
static bool breakdownActive = false;
ToggleBooleanWithShortcut(breakdownActive, ImGuiKey_F);
GUI_AddMainMenuItem(GUI_MainMenu::Perf, "Frame breakdown", "Ctrl+F", &breakdownActive);
ToggleBooleanWithShortcut(breakdownActive, ImGuiKey_F, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Perf, "Frame breakdown", "Ctrl+Shift+F", &breakdownActive);
if(breakdownActive)
{
if(ImGui::Begin("Frame breakdown", &breakdownActive, ImGuiWindowFlags_AlwaysAutoResize))
@ -427,8 +427,8 @@ void SRP::DrawGUI()
}
static bool graphsActive = false;
ToggleBooleanWithShortcut(graphsActive, ImGuiKey_G);
GUI_AddMainMenuItem(GUI_MainMenu::Perf, "Frame time graphs", "Ctrl+G", &graphsActive);
ToggleBooleanWithShortcut(graphsActive, ImGuiKey_G, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Perf, "Frame time graphs", "Ctrl+Shift+G", &graphsActive);
if(graphsActive)
{
const int windowFlags =

34
code/renderer/tr_gui.cpp
View file

@ -597,8 +597,8 @@ static void DrawImageToolTip(const image_t* image)
static void DrawImageList()
{
static bool listActive = false;
ToggleBooleanWithShortcut(listActive, ImGuiKey_I);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Image Explorer", "Ctrl+I", &listActive);
ToggleBooleanWithShortcut(listActive, ImGuiKey_I, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Image Explorer", "Ctrl+Shift+I", &listActive);
if(listActive)
{
if(ImGui::Begin("Image Explorer", &listActive))
@ -767,8 +767,8 @@ static void DrawImageWindow()
static void DrawShaderList()
{
static bool listActive = false;
ToggleBooleanWithShortcut(listActive, ImGuiKey_S);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Shader Explorer", "Ctrl+S", &listActive);
ToggleBooleanWithShortcut(listActive, ImGuiKey_S, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Shader Explorer", "Ctrl+Shift+S", &listActive);
if(listActive)
{
if(ImGui::Begin("Shader Explorer", &listActive))
@ -1007,6 +1007,7 @@ static void DrawShaderWindow()
}
OpenShaderEdit(shader);
}
ImGui::Text("Use Ctrl+Shift+E to edit the shader under the crosshair.");
}
}
}
@ -1866,11 +1867,7 @@ static void DrawShaderEdit()
delayedShaderOpen--;
}
const bool mapLoaded = tr.world != NULL;
if(mapLoaded)
{
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Edit Shader", "Ctrl+E", &shaderEditWindow.active);
}
if((mapLoaded && IsShortcutPressed(ImGuiKey_E)) || delayedShaderOpen == 0)
if((mapLoaded && IsShortcutPressed(ImGuiKey_E, ShortcutOptions::Global)) || delayedShaderOpen == 0)
{
const bool isCheating = IsEditingAllowed();
if(isCheating && !tr.traceWorldShader)
@ -1934,8 +1931,8 @@ static void DrawShaderEdit()
}
ImGui::NewLine();
ImGui::Text("Ctrl-K/L: comment/uncomment code");
ImGui::Text("Ctrl-H : toggle hinting");
ImGui::Text("Ctrl+K/L: Comment/uncomment code");
ImGui::Text("Ctrl+H : Toggle hinting");
ImGui::Separator();
}
@ -1985,21 +1982,20 @@ static void DrawShaderEdit()
editing = true;
}
const bool ctrlDown = ImGui::IsKeyDown(ImGuiMod_Ctrl);
const bool shiftDown = ImGui::IsKeyDown(ImGuiMod_Shift);
if(ctrlDown && ImGui::IsKeyPressed(ImGuiKey_H, false))
if(IsShortcutPressed(ImGuiKey_H, ShortcutOptions::Local))
{
ri.Cvar_Set(r_guiShaderEditHints->name, r_guiShaderEditHints->integer != 0 ? "0" : "1");
}
if(window.charCount < ARRAY_LEN(window.chars) - 1)
{
if(ctrlDown && ImGui::IsKeyPressed(ImGuiKey_K, false))
const bool ctrlDown = ImGui::IsKeyDown(ImGuiMod_Ctrl);
const bool shiftDown = ImGui::IsKeyDown(ImGuiMod_Shift);
if(IsShortcutPressed(ImGuiKey_K, ShortcutOptions::Local))
{
window.chars[window.charCount++] = ShaderEditChar::Comment;
}
else if(ctrlDown && ImGui::IsKeyPressed(ImGuiKey_L, false))
else if(IsShortcutPressed(ImGuiKey_L, ShortcutOptions::Local))
{
window.chars[window.charCount++] = ShaderEditChar::Uncomment;
}
@ -2928,8 +2924,8 @@ static void DrawSettings()
static bool active = false;
static bool restartNeeded = false;
ToggleBooleanWithShortcut(active, ImGuiKey_O);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Client Settings", "Ctrl+O", &active);
ToggleBooleanWithShortcut(active, ImGuiKey_O, ShortcutOptions::Global);
GUI_AddMainMenuItem(GUI_MainMenu::Tools, "Client Settings", "Ctrl+Shift+O", &active);
if(active)
{
const ImGuiWindowFlags flags =