celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-04 11:35:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reenabled custom titlebar for Vulkan

Browse Source
This commit is contained in:
antopilo
2025-01-04 03:07:28 -05:00
parent 5f39899981
commit 0efc76bfaa
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/src/Windows/EditorInterface.cpp
View File

@@ -2458,7 +2458,7 @@ namespace Nuake {
auto window = Window::Get();
window->SetDecorated(true);
//window->ShowTitleBar(false);
window->ShowTitleBar(false);
window->SetSize({ 1600, 900 });
window->Center();
frameCount = 0;

82
Nuake/src/Window.cpp
View File

@@ -59,7 +59,7 @@ int Window::Init()
return -1;
}
//ShowTitleBar(false);
ShowTitleBar(false);
#ifdef NK_VK
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
@@ -72,7 +72,7 @@ int Window::Init()
return -1;
}
//SetWindowIcon("resources/Images/nuake-logo.png");
SetWindowIcon("resources/Images/nuake-logo.png");
glfwMakeContextCurrent(this->window);
//SetVSync(false);
@@ -98,45 +98,45 @@ int Window::Init()
//glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // To make MacOS happy; should not be needed
//glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
//glfwSetWindowUserPointer(window, this);
//
//glfwSetWindowCloseCallback(window, [](GLFWwindow* nativeWindow)
// {
// Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
// window->OnWindowClosed(*window);
// });
//
//glfwSetWindowFocusCallback(window, [](GLFWwindow* nativeWindow, int focused)
// {
// Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
// window->OnWindowFocused(*window, static_cast<bool>(focused));
// });
//
//glfwSetDropCallback(window, [](GLFWwindow* nativeWindow, int count, const char** paths)
// {
// std::vector<std::string> filePaths;
// filePaths.reserve(count);
//
// int i;
// for (i = 0; i < count; i++)
// {
// std::string filePath = std::string(paths[i]);
// filePaths.push_back(filePath);
// }
//
// Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
// window->OnDragNDropCallback(*window, filePaths);
// });
//
//glfwSetTitlebarHitTestCallback(window, [](GLFWwindow* nativeWindow, int x, int y, int* hit)
//{
// bool isHit = false;
// Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
//
// window->TitlebarHitTest(*window, x, y, isHit);
//
// *hit = isHit;
//});
glfwSetWindowUserPointer(window, this);
glfwSetWindowCloseCallback(window, [](GLFWwindow* nativeWindow)
{
Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
window->OnWindowClosed(*window);
});
glfwSetWindowFocusCallback(window, [](GLFWwindow* nativeWindow, int focused)
{
Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
window->OnWindowFocused(*window, static_cast<bool>(focused));
});
glfwSetDropCallback(window, [](GLFWwindow* nativeWindow, int count, const char** paths)
{
std::vector<std::string> filePaths;
filePaths.reserve(count);
int i;
for (i = 0; i < count; i++)
{
std::string filePath = std::string(paths[i]);
filePaths.push_back(filePath);
}
Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
window->OnDragNDropCallback(*window, filePaths);
});
glfwSetTitlebarHitTestCallback(window, [](GLFWwindow* nativeWindow, int x, int y, int* hit)
{
bool isHit = false;
Window* window = reinterpret_cast<Window*>(glfwGetWindowUserPointer(nativeWindow));
window->TitlebarHitTest(*window, x, y, isHit);
*hit = isHit;
});
#ifndef NK_VK
// TODO: have clear color in environnement.