mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-22 05:59:28 +02:00
fixed default value of TImage.Transparent
git-svn-id: trunk@9606 -
This commit is contained in:
mattias
parent
7ccd87bded
commit
e2ba095290
@ -6,7 +6,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
Constraints.MinHeight = 180
|
||||
Constraints.MinWidth = 200
|
||||
OnCreate = FormCreate
|
||||
PixelsPerInch = 96
|
||||
PixelsPerInch = 112
|
||||
Position = poDesktopCenter
|
||||
HorzScrollBar.Page = 369
|
||||
VertScrollBar.Page = 329
|
||||
@ -19,7 +19,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||
BorderSpacing.Around = 6
|
||||
Caption = 'Picture'
|
||||
ClientHeight = 271
|
||||
ClientHeight = 272
|
||||
ClientWidth = 354
|
||||
TabOrder = 0
|
||||
Left = 6
|
||||
@ -29,7 +29,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
object LoadButton: TButton
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Around = 6
|
||||
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = 'Load'
|
||||
OnClick = LoadButtonClick
|
||||
TabOrder = 0
|
||||
@ -40,7 +40,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
object SaveButton: TButton
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Around = 6
|
||||
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = 'Save'
|
||||
OnClick = SaveButtonClick
|
||||
TabOrder = 1
|
||||
@ -52,7 +52,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
object ClearButton: TButton
|
||||
Anchors = [akTop, akRight]
|
||||
BorderSpacing.Around = 6
|
||||
|
||||
BorderSpacing.InnerBorder = 4
|
||||
Caption = 'Clear'
|
||||
OnClick = ClearButtonClick
|
||||
TabOrder = 2
|
||||
@ -68,13 +68,12 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
TabOrder = 3
|
||||
AutoScroll = True
|
||||
Left = 5
|
||||
Height = 261
|
||||
Height = 262
|
||||
Top = 2
|
||||
Width = 261
|
||||
object ImagePreview: TImage
|
||||
AutoSize = True
|
||||
Center = True
|
||||
Transparent = True
|
||||
Height = 100
|
||||
Width = 100
|
||||
end
|
||||
@ -84,7 +83,6 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
Anchors = [akRight, akBottom]
|
||||
BorderSpacing.Bottom = 6
|
||||
BorderSpacing.Around = 6
|
||||
|
||||
Caption = '&OK'
|
||||
Default = True
|
||||
Kind = bkOK
|
||||
@ -99,7 +97,6 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
object CancelButton: TBitBtn
|
||||
Anchors = [akRight, akBottom]
|
||||
BorderSpacing.Around = 6
|
||||
|
||||
Cancel = True
|
||||
Caption = 'Cancel'
|
||||
Kind = bkCancel
|
||||
@ -112,6 +109,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
Width = 75
|
||||
end
|
||||
object OpenDialog: TOpenPictureDialog
|
||||
Filter = 'Graphic (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'
|
||||
Title = 'Open existing file'
|
||||
Filter = 'Graphic (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'
|
||||
FilterIndex = 0
|
||||
@ -120,6 +118,7 @@ object GraphicPropertyEditorForm: TGraphicPropertyEditorForm
|
||||
top = 288
|
||||
end
|
||||
object SaveDialog: TSavePictureDialog
|
||||
Filter = 'Graphic (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'
|
||||
Title = 'Save file as'
|
||||
Filter = 'Graphic (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'
|
||||
FilterIndex = 0
|
||||
|
||||
@ -1,45 +1,57 @@
|
||||
{ This is an automatically generated lazarus resource file }
|
||||
|
||||
LazarusResources.Add('TGraphicPropertyEditorForm','FORMDATA',[
|
||||
'TPF0'#26'TGraphicPropertyEditorForm'#25'GraphicPropertyEditorForm'#13'Active'
|
||||
+'Control'#7#10'LoadButton'#7'Caption'#6#17'Load Image Dialog'#12'ClientHeigh'
|
||||
+'t'#3'J'#1#11'ClientWidth'#3'r'#1#21'Constraints.MinHeight'#3#180#0#20'Const'
|
||||
+'raints.MinWidth'#3#200#0#8'OnCreate'#7#10'FormCreate'#13'PixelsPerInch'#2'`'
|
||||
+'raints.MinWidth'#3#200#0#8'OnCreate'#7#10'FormCreate'#13'PixelsPerInch'#2'p'
|
||||
+#8'Position'#7#15'poDesktopCenter'#18'HorzScrollBar.Page'#3'q'#1#18'VertScro'
|
||||
+'llBar.Page'#3'I'#1#4'Left'#3'"'#1#6'Height'#3'J'#1#3'Top'#3#153#0#5'Width'#3
|
||||
+'r'#1#0#9'TGroupBox'#9'GroupBox1'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'
|
||||
+#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
|
||||
+#7'Picture'#12'ClientHeight'#3#15#1#11'ClientWidth'#3'b'#1#8'TabOrder'#2#0#4
|
||||
+#7'Picture'#12'ClientHeight'#3#16#1#11'ClientWidth'#3'b'#1#8'TabOrder'#2#0#4
|
||||
+'Left'#2#6#6'Height'#3'!'#1#3'Top'#2#6#5'Width'#3'f'#1#0#7'TButton'#10'LoadB'
|
||||
+'utton'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'C'
|
||||
+'aption'#6#4'Load'#7'OnClick'#7#15'LoadButtonClick'#8'TabOrder'#2#0#4'Left'#3
|
||||
+#19#1#6'Height'#2#25#5'Width'#2'K'#0#0#7'TButton'#10'SaveButton'#7'Anchors'
|
||||
+#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#4'Save'#7
|
||||
+'OnClick'#7#15'SaveButtonClick'#8'TabOrder'#2#1#4'Left'#3#19#1#6'Height'#2#25
|
||||
+#3'Top'#2#31#5'Width'#2'K'#0#0#7'TButton'#11'ClearButton'#7'Anchors'#11#5'ak'
|
||||
+'Top'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Clear'#7'OnCl'
|
||||
+'ick'#7#16'ClearButtonClick'#8'TabOrder'#2#2#4'Left'#3#19#1#6'Height'#2#25#3
|
||||
+'Top'#2'>'#5'Width'#2'K'#0#0#10'TScrollBox'#9'ScrollBox'#7'Anchors'#11#5'akT'
|
||||
+'op'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11'Pare'
|
||||
+'ntColor'#8#8'TabOrder'#2#3#10'AutoScroll'#9#4'Left'#2#5#6'Height'#3#5#1#3'T'
|
||||
+'op'#2#2#5'Width'#3#5#1#0#6'TImage'#12'ImagePreview'#8'AutoSize'#9#6'Center'
|
||||
+#9#11'Transparent'#9#6'Height'#2'd'#5'Width'#2'd'#0#0#0#0#7'TBitBtn'#8'OKBut'
|
||||
+'ton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#20
|
||||
+'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'
|
||||
+#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#4'Left'#3#207#0#6'Heig'
|
||||
+'ht'#2#25#3'Top'#3'-'#1#5'Width'#2'K'#0#0#7'TBitBtn'#12'CancelButton'#7'Anch'
|
||||
+'ors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7
|
||||
+'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'
|
||||
+#2#0#8'TabOrder'#2#2#4'Left'#3'!'#1#6'Height'#2#25#3'Top'#3'-'#1#5'Width'#2
|
||||
+'K'#0#0#18'TOpenPictureDialog'#10'OpenDialog'#5'Title'#6#18'Open existing fi'
|
||||
+'le'#6'Filter'#12'2'#1#0#0'Graphic (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bm'
|
||||
+'p)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable Pi'
|
||||
+'xMap (*.ppm)|*.ppm|Portable GrayMap (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*'
|
||||
+'.pbm|Portable Network Graphic (*.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*'
|
||||
+'.bmp)|*.bmp|All files (*.*)|*.*|'#11'FilterIndex'#2#0#5'Title'#6#18'Open ex'
|
||||
+'isting file'#4'left'#3#136#0#3'top'#3' '#1#0#0#18'TSavePictureDialog'#10'Sa'
|
||||
+'veDialog'#5'Title'#6#12'Save file as'#6'Filter'#12'2'#1#0#0'Graphic (*.ico;'
|
||||
+'*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.'
|
||||
+'bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap (*.pg'
|
||||
+'m)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.png)|*.p'
|
||||
+'ng|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'#11'Filt'
|
||||
+'erIndex'#2#0#5'Title'#6#12'Save file as'#4'left'#3#136#0#3'top'#3'@'#1#0#0#0
|
||||
+'utton'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#25
|
||||
+'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Load'#7'OnClick'#7#15'LoadBut'
|
||||
+'tonClick'#8'TabOrder'#2#0#4'Left'#3#19#1#6'Height'#2#25#5'Width'#2'K'#0#0#7
|
||||
+'TButton'#10'SaveButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacin'
|
||||
+'g.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Save'#7'OnCl'
|
||||
+'ick'#7#15'SaveButtonClick'#8'TabOrder'#2#1#4'Left'#3#19#1#6'Height'#2#25#3
|
||||
+'Top'#2#31#5'Width'#2'K'#0#0#7'TButton'#11'ClearButton'#7'Anchors'#11#5'akTo'
|
||||
+'p'#7'akRight'#0#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2
|
||||
+#4#7'Caption'#6#5'Clear'#7'OnClick'#7#16'ClearButtonClick'#8'TabOrder'#2#2#4
|
||||
+'Left'#3#19#1#6'Height'#2#25#3'Top'#2'>'#5'Width'#2'K'#0#0#10'TScrollBox'#9
|
||||
+'ScrollBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'Bor'
|
||||
+'derSpacing.Around'#2#6#11'ParentColor'#8#8'TabOrder'#2#3#10'AutoScroll'#9#4
|
||||
+'Left'#2#5#6'Height'#3#6#1#3'Top'#2#2#5'Width'#3#5#1#0#6'TImage'#12'ImagePre'
|
||||
+'view'#8'AutoSize'#9#6'Center'#9#6'Height'#2'd'#5'Width'#2'd'#0#0#0#0#7'TBit'
|
||||
+'Btn'#8'OKButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Bo'
|
||||
+'ttom'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#4'K'
|
||||
+'ind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#4'Left'
|
||||
+#3#207#0#6'Height'#2#25#3'Top'#3'-'#1#5'Width'#2'K'#0#0#7'TBitBtn'#12'Cancel'
|
||||
+'Button'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
|
||||
+#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2
|
||||
+#9'NumGlyphs'#2#0#8'TabOrder'#2#2#4'Left'#3'!'#1#6'Height'#2#25#3'Top'#3'-'#1
|
||||
+#5'Width'#2'K'#0#0#18'TOpenPictureDialog'#10'OpenDialog'#6'Filter'#12'2'#1#0
|
||||
+#0'Graphic (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.p'
|
||||
+'bm;*.png;*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Porta'
|
||||
+'ble GrayMap (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Gr'
|
||||
+'aphic (*.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*'
|
||||
+'.*)|*.*|'#5'Title'#6#18'Open existing file'#6'Filter'#12'2'#1#0#0'Graphic ('
|
||||
+'*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.'
|
||||
+'xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap'
|
||||
+' (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.pn'
|
||||
+'g)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'#11
|
||||
+'FilterIndex'#2#0#5'Title'#6#18'Open existing file'#4'left'#3#136#0#3'top'#3
|
||||
+' '#1#0#0#18'TSavePictureDialog'#10'SaveDialog'#6'Filter'#12'2'#1#0#0'Graphi'
|
||||
+'c (*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png'
|
||||
+';*.xpm;*.bmp|Icon (*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable Gray'
|
||||
+'Map (*.pgm)|*.pgm|Portable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*'
|
||||
+'.png)|*.png|Pixmap (*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'
|
||||
+#5'Title'#6#12'Save file as'#6'Filter'#12'2'#1#0#0'Graphic (*.ico;*.ppm;*.pg'
|
||||
+'m;*.pbm;*.png;*.xpm;*.bmp)|*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|Icon ('
|
||||
+'*.ico)|*.ico|Portable PixMap (*.ppm)|*.ppm|Portable GrayMap (*.pgm)|*.pgm|P'
|
||||
+'ortable BitMap (*.pbm)|*.pbm|Portable Network Graphic (*.png)|*.png|Pixmap '
|
||||
+'(*.xpm)|*.xpm|Bitmaps (*.bmp)|*.bmp|All files (*.*)|*.*|'#11'FilterIndex'#2
|
||||
+#0#5'Title'#6#12'Save file as'#4'left'#3#136#0#3'top'#3'@'#1#0#0#0
|
||||
]);
|
||||
|
||||
@ -54,7 +54,7 @@ type
|
||||
FileName: String;
|
||||
property Modified: Boolean read FModified write SetModified;
|
||||
property Preview: TImage read ImagePreview write ImagePreview;
|
||||
end;
|
||||
end;
|
||||
|
||||
var
|
||||
GraphicPropertyEditorForm: TGraphicPropertyEditorForm;
|
||||
|
||||
@ -200,8 +200,8 @@ begin
|
||||
Ext := ExtractFileExt(TheDialog.FileName);
|
||||
if ABitmap=nil then ABitmap:=TBitmap.Create;
|
||||
If (ABitmap is TBitmap)
|
||||
and ((AnsiCompareText(Ext, '.xpm') = 0)
|
||||
or (AnsiCompareText(Ext, '.bmp') = 0))
|
||||
and ((CompareText(Ext, '.xpm') = 0)
|
||||
or (CompareText(Ext, '.bmp') = 0))
|
||||
then begin
|
||||
ABitmap.LoadFromFile(TheDialog.FileName);
|
||||
end else begin
|
||||
|
||||
@ -546,7 +546,7 @@ type
|
||||
property OnMouseMove;
|
||||
property OnMouseUp;
|
||||
property Stretch: Boolean read FStretch write SetStretch;
|
||||
property Transparent: Boolean read FTransparent write SetTransparent;
|
||||
property Transparent: Boolean read FTransparent write SetTransparent default true;
|
||||
property Proportional: Boolean read FProportional write SetProportional default false;
|
||||
end;
|
||||
|
||||
|
||||
@ -871,14 +871,17 @@ end;
|
||||
procedure TBitmap.InitFPImageReader(ImgReader: TFPCustomImageReader);
|
||||
begin
|
||||
if ImgReader is TLazReaderBMP then begin
|
||||
// TransparentColor:
|
||||
// clDefault: use left, bottom pixel color as transparent color
|
||||
// clNone: load image opaque
|
||||
// otherwise: use TransparentColor as transparent color
|
||||
TLazReaderBMP(ImgReader).UseLeftBottomAsTransparent:=
|
||||
TransparentColor=clDefault;
|
||||
if (TransparentColor<>clDefault)
|
||||
and (TransparentColor<>clNone) then
|
||||
TLazReaderBMP(ImgReader).TransparentColor:=
|
||||
TColorToFPColor(TransparentColor)
|
||||
(TransparentColor=clDefault);
|
||||
if (TransparentColor=clDefault) or (TransparentColor=clNone) then
|
||||
TLazReaderBMP(ImgReader).TransparentColor:=colTransparent
|
||||
else
|
||||
TLazReaderBMP(ImgReader).TransparentColor:=colTransparent;
|
||||
TLazReaderBMP(ImgReader).TransparentColor:=
|
||||
TColorToFPColor(TransparentColor);
|
||||
//DebugLn('TBitmap.InitFPImageReader ',dbgs(TLazReaderBMP(ImgReader).TransparentColor));
|
||||
end;
|
||||
end;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user