diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index 7b908925..0443ad18 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -80,15 +80,27 @@ inherited frViewGrid: TfrViewGrid Width = 554 ExplicitWidth = 554 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 457 Width = 457 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 240 Width = 240 end inherited edtFechaFinFiltro: TcxDateEdit Left = 344 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 344 ExplicitWidth = 200 Width = 200 @@ -163,7 +175,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39636.760736666660000000 + ReportDocument.CreationDate = 39764.713522488430000000 StyleManager = dmBase.dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas index 0038bcef..12eeebce 100644 --- a/Source/GUIBase/uViewGrid.pas +++ b/Source/GUIBase/uViewGrid.pas @@ -229,37 +229,47 @@ end; procedure TfrViewGrid.cxGridViewStylesGetContentStyle( Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); +var + AFiltrado : Boolean; + AOrdenado : Boolean; + AFilaPar : Boolean; begin inherited; if Assigned(AItem) then begin - if Odd(ARecord.Index) then - AStyle := cxStyle_NORMAL_PAR - else - AStyle := cxStyle_NORMAL_IMPAR; + AFilaPar := Odd(ARecord.Index); + AFiltrado := Filtered; + AOrdenado := AItem.SortOrder <> soNone; - if (AItem.SortOrder <> soNone) then + + if AFilaPar then begin - if Odd(ARecord.Index) then - AStyle := cxStyle_ORDENADO_PAR - else - AStyle := cxStyle_ORDENADO_IMPAR; - end; - - if Filtered then - begin - if Odd(ARecord.Index) then - AStyle := cxStyle_FILTRADO_PAR - else - AStyle := cxStyle_FILTRADO_IMPAR; - - if (AItem.SortOrder <> soNone) then + if AFiltrado then begin - if Odd(ARecord.Index) then + if AOrdenado then AStyle := cxStyle_FILTRADO_ORDENADO_PAR else - AStyle := cxStyle_FILTRADO_ORDENADO_IMPAR; - end; + AStyle := cxStyle_FILTRADO_PAR + end + else // No filtrado + if AOrdenado then + AStyle := cxStyle_ORDENADO_PAR + else + AStyle := cxStyle_NORMAL_PAR + end + else begin + if AFiltrado then + begin + if AOrdenado then + AStyle := cxStyle_FILTRADO_ORDENADO_IMPAR + else + AStyle := cxStyle_FILTRADO_IMPAR + end + else // No filtrado + if AOrdenado then + AStyle := cxStyle_ORDENADO_IMPAR + else + AStyle := cxStyle_NORMAL_IMPAR end; end; end;