UPD: Some optimizations

This commit is contained in:
Alexander Koblov 2009-07-14 16:37:13 +00:00
commit d2de68dac8
4 changed files with 27 additions and 15 deletions

View file

@ -221,20 +221,25 @@ end;
procedure TfrmConfigToolBar.btnOKClick(Sender: TObject);
var
IniBarFile: TIniFileEx;
iDelta: Integer = 4;
begin
Save;
gToolBarButtonSize:= StrToIntDef(edtBarSize.Text, 20);
gToolBarSmallIcons:= cbSmallIcons.Checked;
gToolBarIconSize:= StrToIntDef(edtSmallIconSize.Text, 16);
gToolBarFlat:= cbFlatIcons.Checked;
gToolBarButtonSize:= StrToIntDef(edtBarSize.Text, 16);
gToolBarSmallIcons:= cbSmallIcons.Checked;
if gToolBarSmallIcons then
begin
gToolBarIconSize:= StrToIntDef(edtSmallIconSize.Text, 16);
iDelta:= 0;
end;
// apply new parameters to main toolbar
if gToolBarSmallIcons then
frmMain.MainToolBar.GlyphSize:= gToolBarIconSize
else
frmMain.MainToolBar.GlyphSize:= gToolBarButtonSize - 4;
frmMain.MainToolBar.ButtonHeight:= gToolBarButtonSize;
frmMain.MainToolBar.ButtonWidth:= gToolBarButtonSize;
frmMain.MainToolBar.GlyphSize:= gToolBarButtonSize;
frmMain.MainToolBar.ButtonHeight:= gToolBarButtonSize + iDelta;
frmMain.MainToolBar.ButtonWidth:= gToolBarButtonSize + iDelta;
frmMain.MainToolBar.Flat:= gToolBarFlat;
IniBarFile:= TIniFileEx.Create(gpIniDir + 'default.bar');

View file

@ -451,7 +451,7 @@ object frmMain: TfrmMain
Top = 0
Width = 659
AutoSize = True
Constraints.MinHeight = 24
Constraints.MinHeight = 16
Flat = True
TabOrder = 2
OnDragDrop = MainToolBarDragDrop

View file

@ -3220,8 +3220,9 @@ procedure TfrmMain.UpdateWindowView;
end;
var
I : Integer;
IniBarFile : TIniFileEx;
I: Integer;
IniBarFile: TIniFileEx;
iDelta: Integer;
begin
(* Disk Panels *)
UpdateDiskCount; // Update list of showed drives
@ -3243,11 +3244,17 @@ begin
begin
MainToolBar.Flat:= gToolBarFlat;
if gToolBarSmallIcons then
MainToolBar.GlyphSize:= gToolBarIconSize
begin
MainToolBar.GlyphSize:= gToolBarIconSize;
iDelta:= 0;
end
else
MainToolBar.GlyphSize:= gToolBarButtonSize - 4;
MainToolBar.ButtonHeight:= gToolBarButtonSize;
MainToolBar.ButtonWidth:= gToolBarButtonSize;
begin
MainToolBar.GlyphSize:= gToolBarButtonSize;
iDelta:= 4;
end;
MainToolBar.ButtonHeight:= gToolBarButtonSize + iDelta;
MainToolBar.ButtonWidth:= gToolBarButtonSize + iDelta;
MainToolBar.ChangePath:= gpExePath;
MainToolBar.EnvVar:= '%commander_path%';
try

View file

@ -463,7 +463,7 @@ begin
gButtonBar := gIni.ReadBool('Layout', 'ButtonBar', True);
gToolBarFlat := gIni.ReadBool('ButtonBar', 'FlatIcons', True);
gToolBarButtonSize := gIni.ReadInteger('ButtonBar', 'ButtonHeight', 20);
gToolBarButtonSize := gIni.ReadInteger('ButtonBar', 'ButtonHeight', 16);
gToolBarIconSize := gIni.ReadInteger('ButtonBar', 'SmallIconSize', 16);
gToolBarSmallIcons:= gIni.ReadBool('ButtonBar', 'SmallIcons', False);
gDriveBar1 := gIni.ReadBool('Layout', 'DriveBar1', True);