diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/imgui_extensions.cpp | 2 | ||||
| -rw-r--r-- | src/ui/ui_expenses.cpp | 11 | ||||
| -rw-r--r-- | src/ui/ui_invoices.cpp | 11 | ||||
| -rw-r--r-- | src/ui/ui_projects.cpp | 2 | ||||
| -rw-r--r-- | src/ui/ui_settings.cpp | 4 |
5 files changed, 18 insertions, 12 deletions
diff --git a/src/ui/imgui_extensions.cpp b/src/ui/imgui_extensions.cpp index 9ce5bf9..911906d 100644 --- a/src/ui/imgui_extensions.cpp +++ b/src/ui/imgui_extensions.cpp @@ -747,7 +747,7 @@ namespace ImGui ImGui::SameLine(); ImVec2 cursor_pos = ImGui::GetCursorScreenPos(); - ImVec2 center = ImVec2(cursor_pos.x + radius, cursor_pos.y + radius + 4); + ImVec2 center = ImVec2(cursor_pos.x + radius, cursor_pos.y + radius + 1); ImGui::PushID((int)center.y); ImDrawList* draw_list = ImGui::GetWindowDrawList(); diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp index 64dbc18..7ac977b 100644 --- a/src/ui/ui_expenses.cpp +++ b/src/ui/ui_expenses.cpp @@ -302,10 +302,13 @@ static void _invoice_saved_callback() static void _draw_activity_sidepanel() { ImGui::SameLine(); - ImGui::SeparatorEx(1 << 1, 1.0f); - ImGui::SameLine(); - ImGui::BeginChild("##historyPanel", ImVec2(sidepanel_width, 0), ImGuiChildFlags_None); + ImVec2 area = ImGui::GetContentRegionAvail(); + + ImGui::SetNextWindowPos(ImVec2(ImGui::GetCursorScreenPos().x, ImGui::GetCursorScreenPos().y)); + ImGui::SetNextWindowSize(ImVec2(sidepanel_width, area.y)); + + ImGui::Begin("##historyPanel", nullptr, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse); { for (u32 i = 0; i < activity_count; i++) { @@ -328,7 +331,7 @@ static void _draw_activity_sidepanel() } } - ImGui::EndChild(); + ImGui::End(); } static void draw_expense_update() diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp index 70db412..1c14d77 100644 --- a/src/ui/ui_invoices.cpp +++ b/src/ui/ui_invoices.cpp @@ -397,10 +397,13 @@ static void _reset_to_default_view() static void _draw_activity_sidepanel() { ImGui::SameLine(); - ImGui::SeparatorEx(1 << 1, 1.0f); - ImGui::SameLine(); - ImGui::BeginChild("##historyPanel", ImVec2(sidepanel_width, 0), ImGuiChildFlags_None); + ImVec2 area = ImGui::GetContentRegionAvail(); + + ImGui::SetNextWindowPos(ImVec2(ImGui::GetCursorScreenPos().x, ImGui::GetCursorScreenPos().y)); + ImGui::SetNextWindowSize(ImVec2(sidepanel_width, area.y)); + + ImGui::Begin("##historyPanel", nullptr, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse); { for (u32 i = 0; i < activity_count; i++) { @@ -423,7 +426,7 @@ static void _draw_activity_sidepanel() } } - ImGui::EndChild(); + ImGui::End(); } static void draw_invoice_update() diff --git a/src/ui/ui_projects.cpp b/src/ui/ui_projects.cpp index 55125de..441df46 100644 --- a/src/ui/ui_projects.cpp +++ b/src/ui/ui_projects.cpp @@ -198,7 +198,7 @@ static void draw_project_list() if (administration::project_is_valid(c) != A_ERR_SUCCESS) { if (ImGui::WarningIcon(8.0f)) { - ImGui::SetTooltip(locale::get("ui.tooltip.invalidInvoice")); + ImGui::SetTooltip(locale::get("ui.tooltip.invalidProject")); } } diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp index 4644001..1be032b 100644 --- a/src/ui/ui_settings.cpp +++ b/src/ui/ui_settings.cpp @@ -286,7 +286,7 @@ static void draw_ai_service_ui() ai_service service = administration::get_ai_service((ai_provider)n); new_ai_service.provider = (ai_provider)n; strops::copy(new_ai_service.model_name, service.model_name, MAX_LEN_SHORT_DESC); - strops::copy(new_ai_service.api_key_public, service.api_key_public, MAX_LEN_API_KEY); + strops::copy(new_ai_service.api_key, service.api_key, MAX_LEN_API_KEY); model_request = 0; set_model_on_load = strops::length(new_ai_service.model_name) == 0; @@ -312,7 +312,7 @@ static void draw_ai_service_ui() } ImGui::InputTextWithHint(locale::get("settings.services.ai_service.apikey"), locale::get("settings.services.ai_service.apikey"), - new_ai_service.api_key_public, sizeof(new_ai_service.api_key_public)); + new_ai_service.api_key, sizeof(new_ai_service.api_key)); if (!model_request) { model_request = importer::ai_get_available_models(new_ai_service.provider); |