diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index f3bd63ff..fa93ca3c 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -64,7 +64,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase DroppedDownWidth = 145 MaxMRUCount = 0 FontName = 'Tahoma' - ItemIndex = 34 + ItemIndex = 35 Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Sorted = True TabOrder = 2 @@ -152,8 +152,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase Height = 232 Align = alClient TabOrder = 1 - LookAndFeel.Kind = lfStandard - LookAndFeel.NativeStyle = True object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.Visible = fvNever diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index 2c0c329a..f7b3a722 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -127,9 +127,6 @@ type procedure cxGridViewEditKeyDown(Sender: TcxCustomGridTableView; AItem: TcxCustomGridTableItem; AEdit: TcxCustomEdit; var Key: Word; Shift: TShiftState); - - procedure cxGridViewInitEdit(Sender: TcxCustomGridTableView; - AItem: TcxCustomGridTableItem; AEdit: TcxCustomEdit); procedure FontEdit1BeforeExecute(Sender: TObject); procedure FontEdit1Accept(Sender: TObject); @@ -146,6 +143,8 @@ type procedure TBXItem13Click(Sender: TObject); procedure actAnchoAutomaticoExecute(Sender: TObject); procedure actAnchoAutomaticoUpdate(Sender: TObject); + procedure cxGridViewInitEdit(Sender: TcxCustomGridTableView; + AItem: TcxCustomGridTableItem; AEdit: TcxCustomEdit); private FController : IControllerDetallesBase; @@ -427,30 +426,35 @@ procedure TfrViewDetallesBase.cxGridViewInitEdit(Sender: TcxCustomGridTableView; var FuentePorDefecto: TFont; ARecord: TcxCustomGridRecord; + AEditValue : String; begin inherited; + if AEdit is TcxRichEdit then begin + AEditValue := Trim(VarToStr(AItem.EditValue)); ARecord := AItem.FocusedCellViewInfo.GridRecord; FuentePorDefecto := DarFuentePorDefecto(DarTipoConcepto(ARecord)); - //La primera vez que accedemos al grid entra dos veces y perderiamos el editor - //dando un pete. - if not Assigned(CurEdit) then - begin - FontEdit1.Enabled := True; - // UpDown1.Enabled := True; - // FontSize.Enabled := True; - // FontName.Enabled := True; + try + //La primera vez que accedemos al grid entra dos veces y perderiamos el editor + //dando un pete. + if not Assigned(CurEdit) then + begin + FontEdit1.Enabled := True; + // UpDown1.Enabled := True; + // FontSize.Enabled := True; + // FontName.Enabled := True; - CurEdit := TcxRichEdit(AEdit); - if length(CurEdit.Text) = 0 then - CurEdit.DefAttributes.Assign(FuentePorDefecto) - end - else - if length(CurEdit.Text) = 0 then - CurEdit.DefAttributes.Assign(FuentePorDefecto); - - FreeAndNil(FuentePorDefecto); + CurEdit := TcxRichEdit(AEdit); + if Length(AEditValue) = 0 then + CurEdit.DefAttributes.Assign(FuentePorDefecto) + end + else + if Length(AEditValue) = 0 then + CurEdit.DefAttributes.Assign(FuentePorDefecto); + finally + FreeAndNil(FuentePorDefecto); + end; end else begin @@ -492,7 +496,7 @@ begin begin Result.Name := 'Tahoma'; Result.Size := 9; - Result.Style := []; + Result.Style := []; end; if ATipo = TIPO_DETALLE_TITULO then @@ -539,12 +543,12 @@ var i: Integer; begin i:=0; - while ((cxGridView.Columns[i].DataBinding.FieldName <> Nombre) - and (i < cxGridView.ColumnCount)) do + while ((cxGridView.Columns[i].DataBinding.FieldName <> Nombre) and + (i < cxGridView.ColumnCount)) do inc(i); - if (i = cxGridView.ColumnCount) - then raise Exception.Create('El campo ' + Nombre + ' no se ha encontrado en el grid (uViewDetallesBase)'); + if (i = cxGridView.ColumnCount) then + raise Exception.Create('El campo ' + Nombre + ' no se ha encontrado en el grid (uViewDetallesBase)'); Result := i; end; @@ -732,9 +736,8 @@ end; procedure TfrViewDetallesBase.TBXItem13Click(Sender: TObject); begin inherited; - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; - + if cxGridView.Controller.EditingController.IsEditing then + cxGridView.Controller.EditingController.Edit.PostEditValue; end; procedure TfrViewDetallesBase.actAnadirUpdate(Sender: TObject);