ui improvements

1 files changed, 12 insertions, 5 deletions

diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 72c4964..7356207 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -74,11 +74,11 @@ void draw_invoice_items_form(invoice* invoice, bool outgoing, bool viewing_only
 
     if (ImGui::BeginTable("TableBillingItems", 9, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) {
 
-        ImGui::TableSetupColumn("##actions", ImGuiTableColumnFlags_WidthFixed, 20);
-        ImGui::TableSetupColumn(locale::get("invoice.table.amount"), ImGuiTableColumnFlags_WidthFixed, 80);
+        ImGui::TableSetupColumn("##actions", ImGuiTableColumnFlags_WidthFixed, 30);
+        ImGui::TableSetupColumn(locale::get("invoice.table.amount"), ImGuiTableColumnFlags_WidthFixed, 110);
         ImGui::TableSetupColumn(locale::get("invoice.table.description"));
         ImGui::TableSetupColumn(locale::get("invoice.table.price"), ImGuiTableColumnFlags_WidthFixed, 100);
-        ImGui::TableSetupColumn(locale::get("invoice.table.discount"), ImGuiTableColumnFlags_WidthFixed, 110);
+        ImGui::TableSetupColumn(locale::get("invoice.table.discount"), ImGuiTableColumnFlags_WidthFixed, 130);
         ImGui::TableSetupColumn(locale::get("invoice.table.net"), ImGuiTableColumnFlags_WidthFixed, 100);
         ImGui::TableSetupColumn(locale::get("invoice.table.tax%"), ImGuiTableColumnFlags_WidthFixed, 120);
         ImGui::TableSetupColumn(locale::get("invoice.table.tax"), ImGuiTableColumnFlags_WidthFixed, 100);
@@ -146,7 +146,7 @@ void draw_invoice_items_form(invoice* invoice, bool outgoing, bool viewing_only
         }
 
         ImGui::TableNextRow();
-        ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, IM_COL32(70, 70, 70, 255));
+        ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, ImGui::GetColorU32(ImGuiCol_OrderItemTableRowFinal));
 
         ImGui::TableSetColumnIndex(5); 
         ImGui::Text("%.2f %s", invoice->orig_net, invoice->currency);
@@ -159,7 +159,7 @@ void draw_invoice_items_form(invoice* invoice, bool outgoing, bool viewing_only
 
         if (!strops::equals(invoice->currency, administration::get_default_currency())) {
             ImGui::TableNextRow();
-            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, IM_COL32(50, 50, 50, 255));
+            ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0, ImGui::GetColorU32(ImGuiCol_OrderItemTableRowCurrency));
 
             ImGui::TableSetColumnIndex(2);
             ImGui::Text("%s %s", locale::get("invoice.form.finalSettlement"), administration::get_default_currency());
@@ -221,13 +221,17 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false)
     ImGui::SameLine();
     ImGui::Text(locale::get("invoice.form.deliveredat"));
 
+    ImGui::Spacing();
     ImGui::Separator();
+    ImGui::Spacing();
 
     if (ImGui::FileSelect(locale::get("ui.fileselect.text"), buffer->document.original_path)) {
         buffer->document.copy_path[0] = 0;
     }
 
+    ImGui::Spacing();
     ImGui::Separator();
+    ImGui::Spacing();
 
     ImGui::Text(locale::get("invoice.form.billinginformation"));
     ImGui::ContactForm(&buffer->customer, false, true, false);
@@ -238,7 +242,10 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false)
         ImGui::Text(locale::get("invoice.form.shippinginformation"));
         ImGui::DeliveryInfoForm(&buffer->addressee, 0);
     }
+    
+    ImGui::Spacing();
     ImGui::Separator();
+    ImGui::Spacing();
 
     ImGui::ProjectDropdown(buffer->project_id);