From 389ff729dbdbc222c25919fc7a4a4734fb509a28 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Thu, 12 Mar 2015 23:45:46 +0100 Subject: [PATCH] fix, temp, option editor, convert error after color dialog --- src/ce_main.pas | 4 ++++ src/ce_optionseditor.lfm | 2 +- src/ce_optionseditor.pas | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ce_main.pas b/src/ce_main.pas index f545738f..ffe1d16a 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -713,6 +713,10 @@ var begin Handled := true; {$IFDEF LINUX} + // TODO-cbugfix-linux: AV when closing document, current workaround may have other side effects. + // fixes some issues with property inspectors. + // option editor: IdleTimer seems to be used to refresh values after editing (e.g TColorPropertyEditor) + If not Focused then exit; // fixes the error raised when the update is called after docClosing () // looks like a syncro error, needs more investigation. Application.DisableIdleHandler; diff --git a/src/ce_optionseditor.lfm b/src/ce_optionseditor.lfm index 52ac9fb5..21bafd0a 100644 --- a/src/ce_optionseditor.lfm +++ b/src/ce_optionseditor.lfm @@ -35,7 +35,7 @@ inherited CEOptionEditorWidget: TCEOptionEditorWidget Width = 140 Align = alLeft AutoExpand = True - DefaultItemHeight = 18 + DefaultItemHeight = 16 HideSelection = False ReadOnly = True ScrollBars = ssAutoBoth diff --git a/src/ce_optionseditor.pas b/src/ce_optionseditor.pas index af65abb0..58e16710 100644 --- a/src/ce_optionseditor.pas +++ b/src/ce_optionseditor.pas @@ -20,8 +20,6 @@ type observer: ICEEditableOptions; end; - //TODO-cbugfix: linux only, a conversion error is raised after a color's been edited using the dialog color. - { TCEOptionEditorWidget } TCEOptionEditorWidget = class(TCEWidget) @@ -180,6 +178,8 @@ begin .optionedEvent(oeeCancel); end; + + procedure TCEOptionEditorWidget.inspectorEditorFilter(Sender: TObject;aEditor: TPropertyEditor; var aShow: boolean); begin