krzosa/text_editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Title bar adjust looks

Browse Source
This commit is contained in:
Krzosa Karol
2024-08-01 08:20:58 +02:00
parent cadf7742ab
commit b93cdd8f4c
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build_file.cpp
View File

@@ -373,9 +373,10 @@ void GenerateConfig() {
colors.add({"ScrollbarScroller" , "GruvboxLight1"}); colors.add({"ScrollbarScroller" , "GruvboxLight1"});
colors.add({"ScrollbarScrollerSelected", "GruvboxLight0Hard"}); colors.add({"ScrollbarScrollerSelected", "GruvboxLight0Hard"});
colors.add({"TitleBarText" , "GruvboxDark0Hard"}); colors.add({"TitleBarText" , "GruvboxDark2"});
colors.add({"TitleBarBackground" , "GruvboxLight2"}); colors.add({"TitleBarBackground" , "GruvboxLight1"});
colors.add({"TitleBarSelection" , "GruvboxLight1"}); colors.add({"TitleBarSelection" , "GruvboxLight3"});
// clang-format on // clang-format on
{ {

12
src/text_editor/generated.cpp
View File

@@ -47,9 +47,9 @@ Color ColorWhitespaceDuringSelection = GruvboxLight4;
Color ColorScrollbarBackground = GruvboxLight2; Color ColorScrollbarBackground = GruvboxLight2;
Color ColorScrollbarScroller = GruvboxLight1; Color ColorScrollbarScroller = GruvboxLight1;
Color ColorScrollbarScrollerSelected = GruvboxLight0Hard; Color ColorScrollbarScrollerSelected = GruvboxLight0Hard;
Color ColorTitleBarText = GruvboxDark0Hard; Color ColorTitleBarText = GruvboxDark2;
Color ColorTitleBarBackground = GruvboxLight2; Color ColorTitleBarBackground = GruvboxLight1;
Color ColorTitleBarSelection = GruvboxLight1; Color ColorTitleBarSelection = GruvboxLight3;
String BaseLuaConfig = R"==( String BaseLuaConfig = R"==(
local GruvboxDark0Hard = 0x1d2021ff local GruvboxDark0Hard = 0x1d2021ff
local GruvboxDark0 = 0x282828ff local GruvboxDark0 = 0x282828ff
@@ -101,9 +101,9 @@ Color.WhitespaceDuringSelection = GruvboxLight4
Color.ScrollbarBackground = GruvboxLight2 Color.ScrollbarBackground = GruvboxLight2
Color.ScrollbarScroller = GruvboxLight1 Color.ScrollbarScroller = GruvboxLight1
Color.ScrollbarScrollerSelected = GruvboxLight0Hard Color.ScrollbarScrollerSelected = GruvboxLight0Hard
Color.TitleBarText = GruvboxDark0Hard Color.TitleBarText = GruvboxDark2
Color.TitleBarBackground = GruvboxLight2 Color.TitleBarBackground = GruvboxLight1
Color.TitleBarSelection = GruvboxLight1 Color.TitleBarSelection = GruvboxLight3
-- @todo: should we rewrite linux paths to windows on windows and vice-versa? -- @todo: should we rewrite linux paths to windows on windows and vice-versa?

18
src/text_editor/window.cpp
View File

@@ -7,9 +7,9 @@ Array<Int> GetWindowZOrder(Allocator allocator) {
} }
Window *CreateInfobar(Window *parent_window) { Window *CreateInfobar(Window *parent_window) {
Window *window = CreateWindow(); Window *window = CreateWindow();
window->draw_scrollbar = false; window->draw_scrollbar = false;
window->draw_line_numbers = false; // window->draw_line_numbers = false;
window->dont_save_in_active_window_history = true; window->dont_save_in_active_window_history = true;
window->deactivate_on_escape = true; window->deactivate_on_escape = true;
window->is_title_bar = true; window->is_title_bar = true;
@@ -34,10 +34,10 @@ void InitWindows(View *null_view) {
Allocator sys_allocator = GetSystemAllocator(); Allocator sys_allocator = GetSystemAllocator();
{ {
Window *window = CreateWindow(); Window *window = CreateWindow();
window->draw_line_numbers = false; // window->draw_line_numbers = false;
Buffer *buffer = CreateBuffer(sys_allocator, "*load_text_a*"); Buffer *buffer = CreateBuffer(sys_allocator, "*load_text_a*");
View *view = CreateView(buffer->id); View *view = CreateView(buffer->id);
LoadTextA(buffer); LoadTextA(buffer);
LoadUnicode(buffer); LoadUnicode(buffer);
window->active_view = view->id; window->active_view = view->id;
@@ -138,7 +138,7 @@ void LayoutWindows() {
int i = 0; int i = 0;
Windows[i].total_rect = CutLeft(&screen_rect, (Int)((double)sizex * 0.5)); Windows[i].total_rect = CutLeft(&screen_rect, (Int)((double)sizex * 0.5));
Window *title_bar_window = GetWindow(Windows[i].title_bar_window); Window *title_bar_window = GetWindow(Windows[i].title_bar_window);
title_bar_window->total_rect = CutTop(&Windows[i].total_rect, FontLineSpacing); title_bar_window->total_rect = CutBottom(&Windows[i].total_rect, FontLineSpacing);
Windows[i].document_rect = Windows[i].total_rect; Windows[i].document_rect = Windows[i].total_rect;
title_bar_window->document_rect = title_bar_window->total_rect; title_bar_window->document_rect = title_bar_window->total_rect;
if (Windows[i].draw_scrollbar) Windows[i].scrollbar_rect = CutRight(&Windows[i].document_rect, (Int)ScrollBarSize); if (Windows[i].draw_scrollbar) Windows[i].scrollbar_rect = CutRight(&Windows[i].document_rect, (Int)ScrollBarSize);
@@ -148,7 +148,7 @@ void LayoutWindows() {
int i = 2; int i = 2;
Windows[i].total_rect = CutLeft(&screen_rect, (Int)((double)sizex)); Windows[i].total_rect = CutLeft(&screen_rect, (Int)((double)sizex));
Window *title_bar_window = GetWindow(Windows[i].title_bar_window); Window *title_bar_window = GetWindow(Windows[i].title_bar_window);
title_bar_window->total_rect = CutTop(&Windows[i].total_rect, FontLineSpacing); title_bar_window->total_rect = CutBottom(&Windows[i].total_rect, FontLineSpacing);
title_bar_window->document_rect = title_bar_window->total_rect; title_bar_window->document_rect = title_bar_window->total_rect;
Windows[i].document_rect = Windows[i].total_rect; Windows[i].document_rect = Windows[i].total_rect;
if (Windows[i].draw_scrollbar) Windows[i].scrollbar_rect = CutRight(&Windows[i].document_rect, (Int)ScrollBarSize); if (Windows[i].draw_scrollbar) Windows[i].scrollbar_rect = CutRight(&Windows[i].document_rect, (Int)ScrollBarSize);