asuro/AsuroImgui
1
0
Fork 0
Code Issues Pull Requests Projects Releases 5 Activity

cleanup

Browse Source
This commit is contained in:
Asuro
2022-07-21 16:18:54 +02:00
parent df939555b9
commit 27be3fb0d4
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsuroTool/ApplicationData.h
View File

@@ -41,8 +41,6 @@ class ApplicationSettings {
public: public:
bool docked = false; bool docked = false;
bool showDisabledDevices = false; bool showDisabledDevices = false;
bool fitWindowHeight = true;
bool minimizeToTray = true;
}; };
class ApplicationData { class ApplicationData {

7
AsuroTool/AsuroTool.cpp
View File

@@ -117,7 +117,7 @@ void init(DrawData& drawData, ApplicationData& appData)
// Set window minimize behavior // Set window minimize behavior
glfwSetWindowIconifyCallback(drawData.window, [](GLFWwindow* window, int isIconified) { glfwSetWindowIconifyCallback(drawData.window, [](GLFWwindow* window, int isIconified) {
if (isIconified && hackyAppData->settings.minimizeToTray) if (isIconified && hackyAppData->settings.docked)
{ {
glfwHideWindow(window); glfwHideWindow(window);
} }
@@ -191,10 +191,7 @@ void draw(DrawData& drawData, ApplicationData& appData)
customYCursor += audioDeviceWindow(appData, appData.audioData->recordingDevices, " \xEE\xBD\x8F Recording").y; customYCursor += audioDeviceWindow(appData, appData.audioData->recordingDevices, " \xEE\xBD\x8F Recording").y;
// Resize viewport // Resize viewport
if (appData.settings.fitWindowHeight)
{
drawData.window_size.y = customYCursor; drawData.window_size.y = customYCursor;
}
if (appData.settings.docked) if (appData.settings.docked)
{ {
@@ -231,8 +228,6 @@ ImVec2 menuBar(DrawData& drawData, ApplicationData& appData)
} }
ImGui::Checkbox("Show Disabled Devices", &appData.settings.showDisabledDevices); ImGui::Checkbox("Show Disabled Devices", &appData.settings.showDisabledDevices);
ImGui::Checkbox("Fit Window Height", &appData.settings.fitWindowHeight);
ImGui::Checkbox("Minimize To Tray", &appData.settings.minimizeToTray);
ImGui::EndMenu(); ImGui::EndMenu();
} }

2
ImguiBase/ImguiBase.h
View File

@@ -360,6 +360,7 @@ int startImgui(ImGuiCallbacks& callbacks, const char* title, int windowWidth, in
return 1; return 1;
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
GLFWwindow* window = glfwCreateWindow(windowWidth, windowHeight, title, NULL, NULL); GLFWwindow* window = glfwCreateWindow(windowWidth, windowHeight, title, NULL, NULL);
// Setup Vulkan // Setup Vulkan
@@ -438,6 +439,7 @@ int startImgui(ImGuiCallbacks& callbacks, const char* title, int windowWidth, in
{ {
callbacks.initFunc(drawData); callbacks.initFunc(drawData);
} }
glfwShowWindow(window);
// Upload Fonts // Upload Fonts
{ {