pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Text bugs fixed.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1600 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
yangjixian
2011-04-26 13:51:14 +00:00
parent e5e4ff794f
commit 755d1dbc8d
5 changed files with 113 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
applications/lazimageeditor/DLBitmap.pas
View File

@ -80,6 +80,8 @@ type
FCanvas: TCanvas; FCanvas: TCanvas;
protected protected
procedure KeyDown(var Key: Word; Shift: TShiftState); override; procedure KeyDown(var Key: Word; Shift: TShiftState); override;
procedure DoEnter; override;
procedure DoExit; override;
public public
Editor: TTextEditor; Editor: TTextEditor;
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -455,6 +457,17 @@ begin
end; end;
end; end;
procedure TTextEdit.DoEnter;
begin
inherited;
end;
procedure TTextEdit.DoExit;
begin
inherited;
Editor.StopEdit;
end;
constructor TTextEditor.Create(AOwner: TComponent); constructor TTextEditor.Create(AOwner: TComponent);
begin begin
inherited; inherited;
@ -497,7 +510,6 @@ end;
procedure TTextEditor.DrawFlashLine(Sender: TObject); procedure TTextEditor.DrawFlashLine(Sender: TObject);
var FlashLeft: integer; LeftText: string; var FlashLeft: integer; LeftText: string;
begin begin
FEdit.SetFocus;
flashnum := flashnum + 1; flashnum := flashnum + 1;
if flashnum > 1000 then if flashnum > 1000 then
flashnum := 0; flashnum := 0;
@ -505,8 +517,10 @@ begin
Canvas.Pen.Color := clWhite Canvas.Pen.Color := clWhite
else else
Canvas.Pen.Color := clBlack; Canvas.Pen.Color := clBlack;
FEdit.Font.Assign(IMGCanvas.Font);
Height := FEdit.Height - 3;
LeftText := Copy(FEdit.Text, 1, PositionIndex); LeftText := Copy(FEdit.Text, 1, PositionIndex);
FlashLeft := StartX + Canvas.TextWidth(LeftText); FlashLeft := StartX + IMGCanvas.TextWidth(LeftText);
Left := FlashLeft; Left := FlashLeft;
Top := StartY; Top := StartY;
Canvas.Line(0, 0, 0, Height); Canvas.Line(0, 0, 0, Height);
@ -525,6 +539,7 @@ begin
FEdit.Text := ''; FEdit.Text := '';
Show; Show;
FTimer.Enabled := True; FTimer.Enabled := True;
FEdit.SetFocus;
end; end;
procedure TTextEditor.StopEdit; procedure TTextEditor.StopEdit;
@ -538,7 +553,7 @@ var TextLeft: integer; LeftText, RightText: string;
begin begin
LeftText := Copy(FEdit.Text, 1, PositionIndex); LeftText := Copy(FEdit.Text, 1, PositionIndex);
RightText := Copy(FEdit.Text, PositionIndex + 1, Length(FEdit.text)); RightText := Copy(FEdit.Text, PositionIndex + 1, Length(FEdit.text));
TextLeft := TextX + Canvas.TextWidth(LeftText); TextLeft := TextX + IMGCanvas.TextWidth(LeftText);
if IMGCanvas = nil then if IMGCanvas = nil then
Exit; Exit;
//IMGCanvas.TextOut(22, 22, FEdit.Text); //IMGCanvas.TextOut(22, 22, FEdit.Text);

114
applications/lazimageeditor/lazimageeditor.lpi
View File

@ -46,12 +46,10 @@
<Filename Value="lazimageeditor.pas"/> <Filename Value="lazimageeditor.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="lazimageeditor"/> <UnitName Value="lazimageeditor"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="14" Y="4"/> <CursorPos X="14" Y="4"/>
<UsageCount Value="72"/> <UsageCount Value="73"/>
<Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
@ -63,21 +61,19 @@
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="823"/> <TopLine Value="10"/>
<CursorPos X="25" Y="842"/> <CursorPos X="72" Y="1197"/>
<UsageCount Value="72"/> <UsageCount Value="73"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="picturectrls.pas"/> <Filename Value="picturectrls.pas"/>
<UnitName Value="PictureCtrls"/> <UnitName Value="PictureCtrls"/>
<EditorIndex Value="5"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="667"/> <TopLine Value="25"/>
<CursorPos X="12" Y="684"/> <CursorPos X="3" Y="44"/>
<UsageCount Value="31"/> <UsageCount Value="31"/>
<Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="preview.pas"/> <Filename Value="preview.pas"/>
@ -179,11 +175,11 @@
<Unit13> <Unit13>
<Filename Value="picturemanager.pas"/> <Filename Value="picturemanager.pas"/>
<UnitName Value="PictureManager"/> <UnitName Value="PictureManager"/>
<EditorIndex Value="2"/> <EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="268"/> <TopLine Value="1"/>
<CursorPos X="100" Y="4"/> <CursorPos X="95" Y="2"/>
<UsageCount Value="32"/> <UsageCount Value="33"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit13> </Unit13>
<Unit14> <Unit14>
@ -358,11 +354,11 @@
<Unit35> <Unit35>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<UnitName Value="DLBitmap"/> <UnitName Value="DLBitmap"/>
<EditorIndex Value="3"/> <EditorIndex Value="2"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="514"/> <TopLine Value="506"/>
<CursorPos X="54" Y="541"/> <CursorPos X="39" Y="520"/>
<UsageCount Value="14"/> <UsageCount Value="15"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit35> </Unit35>
<Unit36> <Unit36>
@ -385,17 +381,17 @@
<Filename Value="T:\fpclaz\laz\lcl\controls.pp"/> <Filename Value="T:\fpclaz\laz\lcl\controls.pp"/>
<UnitName Value="Controls"/> <UnitName Value="Controls"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="956"/> <TopLine Value="1805"/>
<CursorPos X="14" Y="975"/> <CursorPos X="17" Y="1812"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit38> </Unit38>
<Unit39> <Unit39>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<EditorIndex Value="4"/> <EditorIndex Value="3"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="561"/> <TopLine Value="483"/>
<CursorPos X="32" Y="562"/> <CursorPos X="97" Y="5"/>
<UsageCount Value="12"/> <UsageCount Value="13"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit39> </Unit39>
<Unit40> <Unit40>
@ -410,123 +406,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="818" Column="22" TopLine="786"/> <Caret Line="637" Column="13" TopLine="605"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="819" Column="16" TopLine="787"/> <Caret Line="644" Column="13" TopLine="612"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="820" Column="19" TopLine="788"/> <Caret Line="658" Column="13" TopLine="626"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="821" Column="22" TopLine="789"/> <Caret Line="665" Column="13" TopLine="633"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="822" Column="18" TopLine="790"/> <Caret Line="835" Column="13" TopLine="803"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="823" Column="17" TopLine="791"/> <Caret Line="842" Column="29" TopLine="806"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="824" Column="20" TopLine="792"/> <Caret Line="480" Column="28" TopLine="462"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="825" Column="22" TopLine="793"/> <Caret Line="842" Column="24" TopLine="823"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="main.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="826" Column="20" TopLine="794"/> <Caret Line="70" Column="91" TopLine="62"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="main.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="828" Column="18" TopLine="796"/> <Caret Line="448" Column="26" TopLine="434"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="main.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="831" Column="36" TopLine="799"/> <Caret Line="82" Column="16" TopLine="63"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="main.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="833" Column="20" TopLine="857"/> <Caret Line="468" Column="3" TopLine="442"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1194" Column="3" TopLine="1175"/> <Caret Line="6" Column="103" TopLine="25"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="367" Column="23" TopLine="344"/> <Caret Line="1195" Column="8" TopLine="1187"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="487" Column="13" TopLine="455"/> <Caret Line="316" Column="39" TopLine="297"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="494" Column="13" TopLine="462"/> <Caret Line="1196" Column="66" TopLine="1183"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="main.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="553" Column="13" TopLine="521"/> <Caret Line="556" Column="32" TopLine="530"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="560" Column="13" TopLine="528"/> <Caret Line="1208" Column="28" TopLine="1194"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="581" Column="13" TopLine="549"/> <Caret Line="1209" Column="28" TopLine="1195"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="588" Column="13" TopLine="556"/> <Caret Line="1208" Column="28" TopLine="1194"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="595" Column="13" TopLine="563"/> <Caret Line="1209" Column="28" TopLine="1195"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="630" Column="13" TopLine="598"/> <Caret Line="1208" Column="28" TopLine="1194"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="637" Column="13" TopLine="605"/> <Caret Line="6" Column="87" TopLine="1"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="644" Column="13" TopLine="612"/> <Caret Line="100" Column="21" TopLine="68"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="658" Column="13" TopLine="626"/> <Caret Line="113" Column="17" TopLine="81"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="665" Column="13" TopLine="633"/> <Caret Line="133" Column="17" TopLine="101"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="835" Column="13" TopLine="803"/> <Caret Line="137" Column="21" TopLine="105"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="842" Column="29" TopLine="806"/> <Caret Line="177" Column="20" TopLine="145"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="480" Column="28" TopLine="462"/> <Caret Line="183" Column="16" TopLine="151"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="842" Column="24" TopLine="823"/> <Caret Line="257" Column="27" TopLine="225"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>

34
applications/lazimageeditor/main.lfm
View File

@ -2,10 +2,10 @@
Left = 260 Left = 260
Height = 681 Height = 681
Top = 147 Top = 147
Width = 935 Width = 920
Caption = 'Lazarus Image Editor' Caption = 'Lazarus Image Editor'
ClientHeight = 659 ClientHeight = 659
ClientWidth = 935 ClientWidth = 920
Font.CharSet = GB2312_CHARSET Font.CharSet = GB2312_CHARSET
Font.Height = -13 Font.Height = -13
Font.Name = '微软雅黑' Font.Name = '微软雅黑'
@ -176,7 +176,7 @@
Left = 0 Left = 0
Height = 22 Height = 22
Top = 637 Top = 637
Width = 935 Width = 920
Panels = < Panels = <
item item
Width = 250 Width = 250
@ -201,7 +201,7 @@
SimplePanel = False SimplePanel = False
end end
object PanelPallete: TPanel object PanelPallete: TPanel
Left = 860 Left = 845
Height = 532 Height = 532
Top = 105 Top = 105
Width = 75 Width = 75
@ -228,17 +228,17 @@
Left = 0 Left = 0
Height = 105 Height = 105
Top = 0 Top = 0
Width = 935 Width = 920
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 105 ClientHeight = 105
ClientWidth = 935 ClientWidth = 920
TabOrder = 2 TabOrder = 2
object Bevel1: TBevel object Bevel1: TBevel
Left = 0 Left = 0
Height = 2 Height = 2
Top = 69 Top = 69
Width = 935 Width = 920
Align = alTop Align = alTop
Shape = bsBottomLine Shape = bsBottomLine
end end
@ -246,7 +246,7 @@
Left = 0 Left = 0
Height = 2 Height = 2
Top = 33 Top = 33
Width = 935 Width = 920
Align = alTop Align = alTop
Shape = bsBottomLine Shape = bsBottomLine
end end
@ -254,7 +254,7 @@
Left = 0 Left = 0
Height = 33 Height = 33
Top = 0 Top = 0
Width = 935 Width = 920
ButtonHeight = 32 ButtonHeight = 32
ButtonWidth = 36 ButtonWidth = 36
Color = clBtnFace Color = clBtnFace
@ -445,10 +445,10 @@
Left = 542 Left = 542
Height = 32 Height = 32
Top = 0 Top = 0
Width = 168 Width = 170
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 32 ClientHeight = 32
ClientWidth = 168 ClientWidth = 170
TabOrder = 1 TabOrder = 1
object FontListBox: TComboBox object FontListBox: TComboBox
Left = 2 Left = 2
@ -476,13 +476,13 @@
Left = 0 Left = 0
Height = 34 Height = 34
Top = 35 Top = 35
Width = 935 Width = 920
Align = alTop Align = alTop
BorderSpacing.InnerBorder = 4 BorderSpacing.InnerBorder = 4
BorderSpacing.CellAlignVertical = ccaCenter BorderSpacing.CellAlignVertical = ccaCenter
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 34 ClientHeight = 34
ClientWidth = 935 ClientWidth = 920
TabOrder = 1 TabOrder = 1
object LabelFillOutline: TLabel object LabelFillOutline: TLabel
Left = 103 Left = 103
@ -518,7 +518,7 @@
ParentColor = False ParentColor = False
end end
object PanelColors: TPanel object PanelColors: TPanel
Left = 723 Left = 708
Height = 34 Height = 34
Top = 0 Top = 0
Width = 212 Width = 212
@ -1110,11 +1110,11 @@
Left = 0 Left = 0
Height = 34 Height = 34
Top = 71 Top = 71
Width = 935 Width = 920
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 34 ClientHeight = 34
ClientWidth = 935 ClientWidth = 920
TabOrder = 2 TabOrder = 2
object LabelSize: TLabel object LabelSize: TLabel
Left = 0 Left = 0
@ -1361,7 +1361,7 @@
Left = 40 Left = 40
Height = 532 Height = 532
Top = 105 Top = 105
Width = 820 Width = 805
Align = alClient Align = alClient
BevelOuter = bvLowered BevelOuter = bvLowered
TabOrder = 3 TabOrder = 3

34
applications/lazimageeditor/main.lrs
View File

@ -2,8 +2,8 @@
LazarusResources.Add('TMainForm','FORMDATA',[ LazarusResources.Add('TMainForm','FORMDATA',[
'TPF0'#9'TMainForm'#8'MainForm'#4'Left'#3#4#1#6'Height'#3#169#2#3'Top'#3#147#0 'TPF0'#9'TMainForm'#8'MainForm'#4'Left'#3#4#1#6'Height'#3#169#2#3'Top'#3#147#0
+#5'Width'#3#167#3#7'Caption'#6#20'Lazarus Image Editor'#12'ClientHeight'#3 +#5'Width'#3#152#3#7'Caption'#6#20'Lazarus Image Editor'#12'ClientHeight'#3
+#147#2#11'ClientWidth'#3#167#3#12'Font.CharSet'#7#14'GB2312_CHARSET'#11'Font' +#147#2#11'ClientWidth'#3#152#3#12'Font.CharSet'#7#14'GB2312_CHARSET'#11'Font'
+'.Height'#2#243#9'Font.Name'#6#12#229#190#174#232#189#175#233#155#133#233#187 +'.Height'#2#243#9'Font.Name'#6#12#229#190#174#232#189#175#233#155#133#233#187
+#145#10'Font.Pitch'#7#10'fpVariable'#12'Font.Quality'#7#7'fqDraft'#4'Menu'#7 +#145#10'Font.Pitch'#7#10'fpVariable'#12'Font.Quality'#7#7'fqDraft'#4'Menu'#7
+#8'MainMenu'#12'OnCloseQuery'#7#14'FormCloseQuery'#8'OnCreate'#7#10'FormCrea' +#8'MainMenu'#12'OnCloseQuery'#7#14'FormCloseQuery'#8'OnCreate'#7#10'FormCrea'
@ -47,23 +47,23 @@ LazarusResources.Add('TMainForm','FORMDATA',[
+'oolBrushClick'#0#0#11'TToolButton'#8'ToolText'#4'Left'#2#0#4'Hint'#6#4'Text' +'oolBrushClick'#0#0#11'TToolButton'#8'ToolText'#4'Left'#2#0#4'Hint'#6#4'Text'
+#3'Top'#3#186#1#7'Caption'#6#9'ToolBrush'#7'Grouped'#9#10'ImageIndex'#2#5#7 +#3'Top'#3#186#1#7'Caption'#6#9'ToolBrush'#7'Grouped'#9#10'ImageIndex'#2#5#7
+'OnClick'#7#13'ToolTextClick'#0#0#0#0#10'TStatusBar'#9'StatusBar'#4'Left'#2#0 +'OnClick'#7#13'ToolTextClick'#0#0#0#0#10'TStatusBar'#9'StatusBar'#4'Left'#2#0
+#6'Height'#2#22#3'Top'#3'}'#2#5'Width'#3#167#3#6'Panels'#14#1#5'Width'#3#250 +#6'Height'#2#22#3'Top'#3'}'#2#5'Width'#3#152#3#6'Panels'#14#1#5'Width'#3#250
+#0#0#1#9'Alignment'#7#8'taCenter'#5'Width'#2'P'#0#1#9'Alignment'#7#8'taCente' +#0#0#1#9'Alignment'#7#8'taCenter'#5'Width'#2'P'#0#1#9'Alignment'#7#8'taCente'
+'r'#5'Width'#2'P'#0#1#5'Width'#2'P'#0#1#5'Width'#2'P'#0#1#5'Width'#2'2'#0#0 +'r'#5'Width'#2'P'#0#1#5'Width'#2'P'#0#1#5'Width'#2'P'#0#1#5'Width'#2'2'#0#0
+#11'SimplePanel'#8#0#0#6'TPanel'#12'PanelPallete'#4'Left'#3'\'#3#6'Height'#3 +#11'SimplePanel'#8#0#0#6'TPanel'#12'PanelPallete'#4'Left'#3'M'#3#6'Height'#3
+#20#2#3'Top'#2'i'#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#10'Bevel' +#20#2#3'Top'#2'i'#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#10'Bevel'
+'Outer'#7#6'bvNone'#12'ClientHeight'#3#20#2#11'ClientWidth'#2'K'#8'TabOrder' +'Outer'#7#6'bvNone'#12'ClientHeight'#3#20#2#11'ClientWidth'#2'K'#8'TabOrder'
+#2#1#0#13'TColorPalette'#7'Palette'#4'Left'#2#0#6'Height'#3#20#2#3'Top'#2#0#5 +#2#1#0#13'TColorPalette'#7'Palette'#4'Left'#2#0#6'Height'#3#20#2#3'Top'#2#0#5
+'Width'#2'K'#5'Align'#7#8'alClient'#11'ButtonWidth'#2#12#12'ButtonHeight'#2 +'Width'#2'K'#5'Align'#7#8'alClient'#11'ButtonWidth'#2#12#12'ButtonHeight'#2
+#12#8'DragMode'#7#11'dmAutomatic'#16'OnColorMouseMove'#7#21'PaletteColorMous' +#12#8'DragMode'#7#11'dmAutomatic'#16'OnColorMouseMove'#7#21'PaletteColorMous'
+'eMove'#11'OnColorPick'#7#16'PaletteColorPick'#0#0#0#6'TPanel'#12'PanelToolB' +'eMove'#11'OnColorPick'#7#16'PaletteColorPick'#0#0#0#6'TPanel'#12'PanelToolB'
+'ar'#4'Left'#2#0#6'Height'#2'i'#3'Top'#2#0#5'Width'#3#167#3#5'Align'#7#5'alT' +'ar'#4'Left'#2#0#6'Height'#2'i'#3'Top'#2#0#5'Width'#3#152#3#5'Align'#7#5'alT'
+'op'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'i'#11'ClientWidth'#3#167#3 +'op'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'i'#11'ClientWidth'#3#152#3
+#8'TabOrder'#2#2#0#6'TBevel'#6'Bevel1'#4'Left'#2#0#6'Height'#2#2#3'Top'#2'E' +#8'TabOrder'#2#2#0#6'TBevel'#6'Bevel1'#4'Left'#2#0#6'Height'#2#2#3'Top'#2'E'
+#5'Width'#3#167#3#5'Align'#7#5'alTop'#5'Shape'#7#12'bsBottomLine'#0#0#6'TBev' +#5'Width'#3#152#3#5'Align'#7#5'alTop'#5'Shape'#7#12'bsBottomLine'#0#0#6'TBev'
+'el'#6'Bevel2'#4'Left'#2#0#6'Height'#2#2#3'Top'#2'!'#5'Width'#3#167#3#5'Alig' +'el'#6'Bevel2'#4'Left'#2#0#6'Height'#2#2#3'Top'#2'!'#5'Width'#3#152#3#5'Alig'
+'n'#7#5'alTop'#5'Shape'#7#12'bsBottomLine'#0#0#8'TToolBar'#7'ToolBar'#4'Left' +'n'#7#5'alTop'#5'Shape'#7#12'bsBottomLine'#0#0#8'TToolBar'#7'ToolBar'#4'Left'
+#2#0#6'Height'#2'!'#3'Top'#2#0#5'Width'#3#167#3#12'ButtonHeight'#2' '#11'But' +#2#0#6'Height'#2'!'#3'Top'#2#0#5'Width'#3#152#3#12'ButtonHeight'#2' '#11'But'
+'tonWidth'#2'$'#5'Color'#7#9'clBtnFace'#11'EdgeBorders'#11#0#6'Images'#7#16 +'tonWidth'#2'$'#5'Color'#7#9'clBtnFace'#11'EdgeBorders'#11#0#6'Images'#7#16
,'ImageListActions'#11'ParentColor'#8#8'TabOrder'#2#0#0#11'TToolButton'#9'Too' ,'ImageListActions'#11'ParentColor'#8#8'TabOrder'#2#0#0#11'TToolButton'#9'Too'
+'lClose'#4'Left'#2'm'#4'Hint'#6#5'Close'#3'Top'#2#0#7'Caption'#6#6'&Close'#10 +'lClose'#4'Left'#2'm'#4'Hint'#6#5'Close'#3'Top'#2#0#7'Caption'#6#6'&Close'#10
@ -109,17 +109,17 @@ LazarusResources.Add('TMainForm','FORMDATA',[
+'ZoomOutBtn'#10'ImageIndex'#2#11#7'OnClick'#7#15'ZoomOutBtnClick'#0#0#11'TTo' +'ZoomOutBtn'#10'ImageIndex'#2#11#7'OnClick'#7#15'ZoomOutBtnClick'#0#0#11'TTo'
+'olButton'#11'ToolButton1'#4'Left'#3#22#2#3'Top'#2#0#5'Width'#2#8#7'Caption' +'olButton'#11'ToolButton1'#4'Left'#3#22#2#3'Top'#2#0#5'Width'#2#8#7'Caption'
+#6#11'ToolButton1'#5'Style'#7#12'tbsSeparator'#0#0#6'TPanel'#6'Panel1'#4'Lef' +#6#11'ToolButton1'#5'Style'#7#12'tbsSeparator'#0#0#6'TPanel'#6'Panel1'#4'Lef'
+'t'#3#30#2#6'Height'#2' '#3'Top'#2#0#5'Width'#3#168#0#10'BevelOuter'#7#6'bvN' +'t'#3#30#2#6'Height'#2' '#3'Top'#2#0#5'Width'#3#170#0#10'BevelOuter'#7#6'bvN'
+'one'#12'ClientHeight'#2' '#11'ClientWidth'#3#168#0#8'TabOrder'#2#1#0#9'TCom' +'one'#12'ClientHeight'#2' '#11'ClientWidth'#3#170#0#8'TabOrder'#2#1#0#9'TCom'
+'boBox'#11'FontListBox'#4'Left'#2#2#6'Height'#2#27#3'Top'#2#3#5'Width'#2'p' +'boBox'#11'FontListBox'#4'Left'#2#2#6'Height'#2#27#3'Top'#2#3#5'Width'#2'p'
+#10'ItemHeight'#2#19#8'OnChange'#7#17'FontListBoxChange'#7'OnClick'#7#16'Fon' +#10'ItemHeight'#2#19#8'OnChange'#7#17'FontListBoxChange'#7'OnClick'#7#16'Fon'
+'tListBoxClick'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#9'TSpinEdi' +'tListBoxClick'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#9'TSpinEdi'
+'t'#8'FontSize'#4'Left'#2'u'#6'Height'#2#27#3'Top'#2#3#5'Width'#2'2'#8'OnCha' +'t'#8'FontSize'#4'Left'#2'u'#6'Height'#2#27#3'Top'#2#3#5'Width'#2'2'#8'OnCha'
+'nge'#7#14'FontSizeChange'#8'TabOrder'#2#1#5'Value'#2#10#0#0#0#0#6'TPanel'#12 +'nge'#7#14'FontSizeChange'#8'TabOrder'#2#1#5'Value'#2#10#0#0#0#0#6'TPanel'#12
+'PanelOptions'#4'Left'#2#0#6'Height'#2'"'#3'Top'#2'#'#5'Width'#3#167#3#5'Ali' +'PanelOptions'#4'Left'#2#0#6'Height'#2'"'#3'Top'#2'#'#5'Width'#3#152#3#5'Ali'
+'gn'#7#5'alTop'#25'BorderSpacing.InnerBorder'#2#4#31'BorderSpacing.CellAlign' +'gn'#7#5'alTop'#25'BorderSpacing.InnerBorder'#2#4#31'BorderSpacing.CellAlign'
+'Vertical'#7#9'ccaCenter'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'"'#11 +'Vertical'#7#9'ccaCenter'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'"'#11
+'ClientWidth'#3#167#3#8'TabOrder'#2#1#0#6'TLabel'#16'LabelFillOutline'#4'Lef' +'ClientWidth'#3#152#3#8'TabOrder'#2#1#0#6'TLabel'#16'LabelFillOutline'#4'Lef'
+'t'#2'g'#6'Height'#2'"'#3'Top'#2#0#5'Width'#2'H'#5'Align'#7#6'alLeft'#7'Capt' +'t'#2'g'#6'Height'#2'"'#3'Top'#2#0#5'Width'#2'H'#5'Align'#7#6'alLeft'#7'Capt'
+'ion'#6#14'Fill, Outline:'#21'Constraints.MinHeight'#2' '#6'Layout'#7#8'tlCe' +'ion'#6#14'Fill, Outline:'#21'Constraints.MinHeight'#2' '#6'Layout'#7#8'tlCe'
+'nter'#11'ParentColor'#8#0#0#6'TLabel'#10'LabelShape'#4'Left'#2#0#6'Height'#2 +'nter'#11'ParentColor'#8#0#0#6'TLabel'#10'LabelShape'#4'Left'#2#0#6'Height'#2
@ -128,7 +128,7 @@ LazarusResources.Add('TMainForm','FORMDATA',[
+'TLabel'#13'LabelMaskTool'#4'Left'#3#2#1#6'Height'#2'"'#3'Top'#2#0#5'Width'#2 +'TLabel'#13'LabelMaskTool'#4'Left'#3#2#1#6'Height'#2'"'#3'Top'#2#0#5'Width'#2
+'C'#5'Align'#7#6'alLeft'#7'Caption'#6#10'Mask Tool:'#21'Constraints.MinHeigh' +'C'#5'Align'#7#6'alLeft'#7'Caption'#6#10'Mask Tool:'#21'Constraints.MinHeigh'
+'t'#2' '#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#6'TPanel'#11'PanelCol' +'t'#2' '#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#6'TPanel'#11'PanelCol'
+'ors'#4'Left'#3#211#2#6'Height'#2'"'#3'Top'#2#0#5'Width'#3#212#0#5'Align'#7#7 +'ors'#4'Left'#3#196#2#6'Height'#2'"'#3'Top'#2#0#5'Width'#3#212#0#5'Align'#7#7
,'alRight'#8'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#4'!BorderSpacing.Cel' ,'alRight'#8'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#4'!BorderSpacing.Cel'
+'lAlignHorizontal'#7#10'ccaLeftTop'#31'BorderSpacing.CellAlignVertical'#7#9 +'lAlignHorizontal'#7#10'ccaLeftTop'#31'BorderSpacing.CellAlignVertical'#7#9
+'ccaCenter'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'"'#11'ClientWidth' +'ccaCenter'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'"'#11'ClientWidth'
@ -691,8 +691,8 @@ LazarusResources.Add('TMainForm','FORMDATA',[
+#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0 +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
+#255#255#255#0#255#255#255#0#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7 +#255#255#255#0#255#255#255#0#10'GroupIndex'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7
+#22'ToolMaskFloodFillClick'#0#0#0#0#6'TPanel'#16'PanelToolOptions'#4'Left'#2 +#22'ToolMaskFloodFillClick'#0#0#0#0#6'TPanel'#16'PanelToolOptions'#4'Left'#2
+#0#6'Height'#2'"'#3'Top'#2'G'#5'Width'#3#167#3#5'Align'#7#5'alTop'#10'BevelO' +#0#6'Height'#2'"'#3'Top'#2'G'#5'Width'#3#152#3#5'Align'#7#5'alTop'#10'BevelO'
+'uter'#7#6'bvNone'#12'ClientHeight'#2'"'#11'ClientWidth'#3#167#3#8'TabOrder' +'uter'#7#6'bvNone'#12'ClientHeight'#2'"'#11'ClientWidth'#3#152#3#8'TabOrder'
+#2#2#0#6'TLabel'#9'LabelSize'#4'Left'#2#0#6'Height'#2'"'#3'Top'#2#0#5'Width' +#2#2#0#6'TLabel'#9'LabelSize'#4'Left'#2#0#6'Height'#2'"'#3'Top'#2#0#5'Width'
+#2#28#5'Align'#7#6'alLeft'#7'Caption'#6#5'Size:'#21'Constraints.MinHeight'#2 +#2#28#5'Align'#7#6'alLeft'#7'Caption'#6#5'Size:'#21'Constraints.MinHeight'#2
+' '#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#6'TLabel'#12'LabelDensity' +' '#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#6'TLabel'#12'LabelDensity'
@ -749,7 +749,7 @@ LazarusResources.Add('TMainForm','FORMDATA',[
+#30#8'TabOrder'#2#5#0#9'TCheckBox'#10'checkFuzzy'#4'Left'#2#4#6'Height'#2#19 +#30#8'TabOrder'#2#5#0#9'TCheckBox'#10'checkFuzzy'#4'Left'#2#4#6'Height'#2#19
+#3'Top'#2#9#5'Width'#2#20#8'OnChange'#7#16'checkFuzzyChange'#8'TabOrder'#2#0 +#3'Top'#2#9#5'Width'#2#20#8'OnChange'#7#16'checkFuzzyChange'#8'TabOrder'#2#0
+#0#0#0#0#0#6'TPanel'#13'PanelPictures'#4'Left'#2'('#6'Height'#3#20#2#3'Top'#2 +#0#0#0#0#0#6'TPanel'#13'PanelPictures'#4'Left'#2'('#6'Height'#3#20#2#3'Top'#2
+'i'#5'Width'#3'4'#3#5'Align'#7#8'alClient'#10'BevelOuter'#7#9'bvLowered'#8'T' +'i'#5'Width'#3'%'#3#5'Align'#7#8'alClient'#10'BevelOuter'#7#9'bvLowered'#8'T'
+'abOrder'#2#3#0#0#9'TMainMenu'#8'MainMenu'#6'Images'#7#16'ImageListActions'#4 +'abOrder'#2#3#0#0#9'TMainMenu'#8'MainMenu'#6'Images'#7#16'ImageListActions'#4
+'left'#2'r'#3'top'#2'~'#0#9'TMenuItem'#12'MenuItemFile'#7'Caption'#6#5'&File' +'left'#2'r'#3'top'#2'~'#0#9'TMenuItem'#12'MenuItemFile'#7'Caption'#6#5'&File'
+#0#9'TMenuItem'#11'MenuItemNew'#7'Caption'#6#7'&New...'#11'Bitmap.Data'#10'z' +#0#9'TMenuItem'#11'MenuItemNew'#7'Caption'#6#7'&New...'#11'Bitmap.Data'#10'z'

9
applications/lazimageeditor/main.pas
View File

@ -32,7 +32,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus,
ExtCtrls, ComCtrls, ActnList, StdActns, ExtDlgs, Buttons, StdCtrls, Spin, ExtCtrls, ComCtrls, ActnList, StdActns, ExtDlgs, Buttons, StdCtrls, Spin,
NewDialog, ResizeDialog, ResizePaperDialog, AboutDialog, DLBitmap, ColorBox, NewDialog, ResizeDialog, ResizePaperDialog, AboutDialog, DLBitmap,
PictureManager, PictureCtrls, ColorPalette; PictureManager, PictureCtrls, ColorPalette;
type type
@ -1192,7 +1192,9 @@ end;
procedure TMainForm.FontListBoxChange(Sender: TObject); procedure TMainForm.FontListBoxChange(Sender: TObject);
begin begin
ActivePictureEdit.Canvas.Font.Name := FontListBox.Text; //ActivePictureEdit.Canvas.Font.Name := FontListBox.Text;
ActivePictureEdit.Picture.Canvas.Font.Name := FontListBox.Text;
ActivePictureEdit.Picture.Canvas.Font.Color := PanelOutline.Color;
if ActivePictureEdit.Tool <> ptText then if ActivePictureEdit.Tool <> ptText then
TextEditor.StopEdit; TextEditor.StopEdit;
end; end;
@ -1204,7 +1206,8 @@ end;
procedure TMainForm.FontSizeChange(Sender: TObject); procedure TMainForm.FontSizeChange(Sender: TObject);
begin begin
ActivePictureEdit.Canvas.Font.Size := FontSize.Value; ActivePictureEdit.Picture.Canvas.Font.Size := FontSize.Value;
ActivePictureEdit.Picture.Canvas.Font.Color := PanelOutline.Color;
end; end;
procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: boolean);