Misc
This commit is contained in:
@@ -371,7 +371,7 @@ void ReloadFont(int32_t size) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Scratch scratch;
|
Scratch scratch;
|
||||||
Atlas atlas = CreateAtlas(scratch, {1024, 1024});
|
Atlas atlas = CreateAtlas(scratch, {2048, 2048});
|
||||||
MainFont = CreateFont(&atlas, size, FontPath);
|
MainFont = CreateFont(&atlas, size, FontPath);
|
||||||
{
|
{
|
||||||
glCreateTextures(GL_TEXTURE_2D, 1, &atlas.texture_id);
|
glCreateTextures(GL_TEXTURE_2D, 1, &atlas.texture_id);
|
||||||
|
|||||||
@@ -328,8 +328,10 @@ bool GlobalCommand(Event event) {
|
|||||||
|
|
||||||
if (Ctrl(SDLK_MINUS)) {
|
if (Ctrl(SDLK_MINUS)) {
|
||||||
ReloadFont((int32_t)MainFont.size - 1);
|
ReloadFont((int32_t)MainFont.size - 1);
|
||||||
|
run_window_command = false;
|
||||||
} else if (Ctrl(SDLK_EQUALS)) {
|
} else if (Ctrl(SDLK_EQUALS)) {
|
||||||
ReloadFont((int32_t)MainFont.size + 1);
|
ReloadFont((int32_t)MainFont.size + 1);
|
||||||
|
run_window_command = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return run_window_command;
|
return run_window_command;
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ WindowID GetLastActiveWindow() {
|
|||||||
return NullWindowID;
|
return NullWindowID;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetActiveWindow(WindowID window) {
|
bool SetActiveWindow(WindowID window) {
|
||||||
if (window.id != ActiveWindow.id && LastFrameIDWhenSwitchedActiveWindow != FrameID) {
|
if (window.id != ActiveWindow.id && LastFrameIDWhenSwitchedActiveWindow != FrameID) {
|
||||||
LastFrameIDWhenSwitchedActiveWindow = FrameID;
|
LastFrameIDWhenSwitchedActiveWindow = FrameID;
|
||||||
ActiveWindow = window;
|
ActiveWindow = window;
|
||||||
@@ -110,7 +110,9 @@ void SetActiveWindow(WindowID window) {
|
|||||||
if (!w->dont_save_in_active_window_history) {
|
if (!w->dont_save_in_active_window_history) {
|
||||||
Add(&WindowSwitchHistory, window);
|
Add(&WindowSwitchHistory, window);
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Window *FindParentWindow(ViewID view_id) {
|
Window *FindParentWindow(ViewID view_id) {
|
||||||
|
|||||||
@@ -268,7 +268,6 @@ int main()
|
|||||||
SDL_DestroyWindow(window);
|
SDL_DestroyWindow(window);
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
|
|
||||||
EndProfileScope();
|
|
||||||
EndProfiler();
|
EndProfiler();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user