Browse Source

Grids: fixed corner case bugs with cell renderers

Herman Schoenfeld 7 years ago
parent
commit
5bd5e68ffc
1 changed files with 6 additions and 9 deletions
  1. 6 9
      src/gui/UCellRenderers.pas

+ 6 - 9
src/gui/UCellRenderers.pas

@@ -102,7 +102,8 @@ begin
     Canvas.TextRect(Rect, Rect.Left, Rect.Top, 'ALL BALANCE', Canvas.TextStyle);
     Handled := true;
     exit;
-  end else PASC(Sender, ACol, ARow, Canvas, Rect, State, CellData, RowData, Handled);
+  end;
+  PASC(Sender, ACol, ARow, Canvas, Rect, State, CellData, RowData, Handled);
 end;
 
 class procedure TCellRenderers.PASC_CheckPendingBalance (Sender: TObject; ACol, ARow: Longint; Canvas: TCanvas; Rect: TRect; State: TGridDrawState; const CellData, RowData: Variant; var Handled: boolean);
@@ -123,7 +124,8 @@ begin
     Canvas.TextRect(Rect, Rect.Left, Rect.Top, LStr, Canvas.TextStyle);
     Handled := true;
     exit;
-  end else PASC(Sender, ACol, ARow, Canvas, Rect, State, CellData, RowData, Handled);
+  end;
+  PASC(Sender, ACol, ARow, Canvas, Rect, State, CellData, RowData, Handled);
 end;
 
 class procedure TCellRenderers.PASC (Sender: TObject; ACol, ARow: Longint; Canvas: TCanvas; Rect: TRect; State: TGridDrawState; const CellData, RowData: Variant; var Handled: boolean);
@@ -137,13 +139,8 @@ begin
     exit;
   LValue := CellData;
   LRowData := TDataRowData(RowData);
-  if LRowData.HasData('UnixTime')  AND (LRowData['UnixTime'] = 0) then begin
-    Canvas.Font.Color := CT_PASCBALANCE_0CONF_COL;
-    LStr := '('+TAccountComp.FormatMoney(LValue)+')';
-  end else begin
-    Canvas.Font.Color := IIF (LValue < 0, CT_PASCBALANCE_NEG_COL, IIF(LValue > 0, CT_PASCBALANCE_POS_COL, CT_PASCBALANCE_NEU_COL));
-    LStr := TAccountComp.FormatMoney(LValue);
-  end;
+  Canvas.Font.Color := IIF (LValue < 0, CT_PASCBALANCE_NEG_COL, IIF(LValue > 0, CT_PASCBALANCE_POS_COL, CT_PASCBALANCE_NEU_COL));
+  LStr := TAccountComp.FormatMoney(LValue);
   Canvas.TextRect(Rect, Rect.Left, Rect.Top, LStr, Canvas.TextStyle);
   Handled := true;
 end;