diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_tax.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/ui/ui_tax.cpp b/src/ui/ui_tax.cpp index 37eeaee..8a119e4 100644 --- a/src/ui/ui_tax.cpp +++ b/src/ui/ui_tax.cpp @@ -66,9 +66,9 @@ void ui::draw_tax_report() { ImGui::PushFont(fontBold); ImGui::TableSetupColumn("##desc", ImGuiTableColumnFlags_WidthStretch); - ImGui::TableSetupColumn("##names", ImGuiTableColumnFlags_WidthFixed, 150); - ImGui::TableSetupColumn(report.quarter_str, ImGuiTableColumnFlags_WidthFixed, 150); - ImGui::TableSetupColumn("##tax", ImGuiTableColumnFlags_WidthFixed, 150); + ImGui::TableSetupColumn("##names", ImGuiTableColumnFlags_WidthFixed, 60); + ImGui::TableSetupColumn(report.quarter_str, ImGuiTableColumnFlags_WidthFixed, 120); + ImGui::TableSetupColumn("##tax", ImGuiTableColumnFlags_WidthFixed, 120); ImGui::TableHeadersRow(); ImGui::PopFont(); @@ -85,6 +85,7 @@ void ui::draw_tax_report() ImGui::TableSetColumnIndex(0); ImGui::Text("%s", locale::get(line.tax_description)); ImGui::TableSetColumnIndex(1); ImGui::Text("%s", locale::get(line.tax_category)); + #if 0 if (!strops::equals(line.tax_category, "")) { ImGui::TableSetColumnIndex(2); ImGui::Text("%.2f %s", line.total_net, currency_symbol); @@ -102,6 +103,27 @@ void ui::draw_tax_report() } } } + #else + ImGui::TableSetColumnIndex(2); + if (line.show_net) ImGui::Text("%.2f %s", line.total_net, currency_symbol); + else ImGui::Text(""); + + ImGui::TableSetColumnIndex(3); + if (line.show_tax) { + if (!is_last) ImGui::Text("%.2f %s", line.total_tax, currency_symbol); + else { + if (line.total_tax < 0.0f) { + ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(235, 64, 52, 255)); + ImGui::Text("(%.0f %s)", line.total_tax, currency_symbol); + ImGui::PopStyleColor(); + } + else { + ImGui::Text("%.0f %s", line.total_tax, currency_symbol); + } + } + } + else ImGui::Text(""); + #endif if (bold) ImGui::PopFont(); } |