paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-26 14:37:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa/ListView: several optimizations , Merge branch 'cocoa/listview'

Browse Source
This commit is contained in:
rich2014 2024-08-13 20:42:27 +08:00
commit d4d817e7af
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/cocoa/cocoacollectionview.pas
View File

@ -351,8 +351,8 @@ begin
if cv.iconSize.Height < 32 then if cv.iconSize.Height < 32 then
cv.iconSize.Height:= 32; cv.iconSize.Height:= 32;
cv.itemSize.Width:= 10 + baseSize.Width + 10; cv.itemSize.Width:= 10 + cv.iconSize.Width + 10;
cv.itemSize.Height:= 10 + baseSize.Height + 2 + 14 + 10; cv.itemSize.Height:= 10 + cv.iconSize.Height + 2 + 14 + 10;
if cv.itemSize.Width < 64 then if cv.itemSize.Width < 64 then
cv.itemSize.Width:= 64; cv.itemSize.Width:= 64;
if cv.itemSize.Height < 68 then if cv.itemSize.Height < 68 then
@ -384,7 +384,7 @@ begin
aFrame.size.height:= 15; aFrame.size.height:= 15;
if Assigned(checkBox) then if Assigned(checkBox) then
aFrame.origin.x:= aFrame.origin.x + 24; aFrame.origin.x:= aFrame.origin.x + 24;
aFrame.size.width:= cv.itemSize.Width - aFrame.origin.x - 4; aFrame.size.width:= cv.itemSize.Width - aFrame.origin.x;
cocoaItem.textField.setAlignment( NSTextAlignmentCenter ); cocoaItem.textField.setAlignment( NSTextAlignmentCenter );
cocoaItem.textField.setFrame( aFrame ); cocoaItem.textField.setFrame( aFrame );
@ -401,7 +401,8 @@ procedure TCocoaListView_CollectionView_LargeIconHandler.onAdjustTextEditorRect(
var aFrame: NSRect); var aFrame: NSRect);
begin begin
aFrame.origin.y:= aFrame.origin.y - 1; aFrame.origin.y:= aFrame.origin.y - 1;
aFrame.size.width:= aFrame.size.width + 2; aFrame.origin.x:= aFrame.origin.x + 2;
aFrame.size.width:= aFrame.size.width - 4;
end; end;
{ TCocoaListView_CollectionView_SmallIconHandler } { TCocoaListView_CollectionView_SmallIconHandler }
@ -605,8 +606,10 @@ begin
indexPath:= cv.indexPathForItem( self ); indexPath:= cv.indexPathForItem( self );
row:= indexPath.item; row:= indexPath.item;
cv.callback.SetItemCheckedAt( row, 0, sender.state ); cv.callback.SetItemCheckedAt( row, 0, sender.state );
if sender.state = NSOnState then if sender.state = NSOnState then begin
cv.selectOneItemByIndex( row, True ); cv.selectOneItemByIndex( row, True );
self.view.window.makeFirstResponder( self.collectionView );
end;
end; end;
procedure TCocoaCollectionItem.loadView; procedure TCocoaCollectionItem.loadView;
@ -619,7 +622,7 @@ begin
itemView.item:= self; itemView.item:= self;
imageControl:= NSImageView.alloc.initWithFrame( NSZeroRect ); imageControl:= NSImageView.alloc.initWithFrame( NSZeroRect );
imageControl.cell.setImageScaling( NSImageScaleProportionallyUpOrDown ); imageControl.setImageScaling( NSImageScaleProportionallyUpOrDown );
self.setImageView( imageControl ); self.setImageView( imageControl );
itemView.addSubview( imageControl ); itemView.addSubview( imageControl );
@ -647,6 +650,7 @@ begin
_checkBox:= nil; _checkBox:= nil;
end; end;
self.imageView.setImage( nil );
self.view.removeFromSuperview; self.view.removeFromSuperview;
end; end;

4
lcl/interfaces/cocoa/cocoatables.pas
View File

@ -975,7 +975,7 @@ begin
Exit; Exit;
imageControl:= NSImageView.alloc.initWithFrame( NSZeroRect ); imageControl:= NSImageView.alloc.initWithFrame( NSZeroRect );
imageControl.cell.setImageScaling( NSImageScaleProportionallyUpOrDown ); imageControl.setImageScaling( NSImageScaleProportionallyUpOrDown );
self.setImageView( imageControl ); self.setImageView( imageControl );
self.addSubview( imageControl ); self.addSubview( imageControl );
end; end;
@ -1184,8 +1184,8 @@ begin
callback.SetItemCheckedAt(row, 0, sender.state); callback.SetItemCheckedAt(row, 0, sender.state);
if sender.state = NSOnState then begin if sender.state = NSOnState then begin
self.selectOneItemByIndex(row, True); self.selectOneItemByIndex(row, True);
self.window.makeFirstResponder( self );
end; end;
reloadDataForRow_column(row, 0);
end; end;
{ TCocoaWSListView_TableViewHandler } { TCocoaWSListView_TableViewHandler }