From ff065ea7edfec506047e9a3ef97f1855bb5ed1e3 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Wed, 21 Jan 2026 17:01:43 +0100 Subject: [PATCH] style: reduce borders around controls --- source/apphelpers.pas | 1 + source/main.lfm | 149 +++++++++++++++++++++--------------------- source/main.pas | 2 + 3 files changed, 79 insertions(+), 73 deletions(-) diff --git a/source/apphelpers.pas b/source/apphelpers.pas index 47947ba6..9d03a9b6 100644 --- a/source/apphelpers.pas +++ b/source/apphelpers.pas @@ -1509,6 +1509,7 @@ begin VT.HintMode := hmTooltip; // Just a quick tooltip for clipped nodes VT.OnStartOperation := Mainform.AnyGridStartOperation; VT.OnEndOperation := Mainform.AnyGridEndOperation; + VT.BorderStyle := bsNone; // Cosmetic end; diff --git a/source/main.lfm b/source/main.lfm index 347aac31..c1edb073 100644 --- a/source/main.lfm +++ b/source/main.lfm @@ -53,11 +53,12 @@ object MainForm: TMainForm end object ToolBarMainButtons: TToolBar Left = 0 - Height = 30 + Height = 28 Top = 0 Width = 998 AutoSize = True Caption = 'ToolBarMainButtons' + EdgeBorders = [] Images = ImageListMain ParentShowHint = False ShowHint = True @@ -65,7 +66,7 @@ object MainForm: TMainForm Wrapable = False object ToolButton9: TToolButton Left = 1 - Top = 2 + Top = 0 Action = actSessionManager AutoSize = True DropdownMenu = menuConnections @@ -73,51 +74,51 @@ object MainForm: TMainForm end object btnExit: TToolButton Left = 45 - Top = 2 + Top = 0 Action = actDisconnect end object tlbSep1: TToolButton Left = 74 Height = 28 - Top = 2 + Top = 0 Caption = 'tlbSep1' ImageIndex = 2 Style = tbsSeparator end object ToolButton5: TToolButton Left = 82 - Top = 2 + Top = 0 Action = actCopy AutoSize = True end object ToolButton6: TToolButton Left = 111 - Top = 2 + Top = 0 Action = actPaste AutoSize = True end object ToolButton14: TToolButton Left = 140 Hint = 'Undo' - Top = 2 + Top = 0 Action = actUndo end object ToolButton12: TToolButton Left = 169 - Top = 2 + Top = 0 Action = actPrintList end object tlbSep2: TToolButton Left = 198 Height = 28 - Top = 2 + Top = 0 Caption = 'tlbSep2' ImageIndex = 3 Style = tbsSeparator end object ButtonRefresh: TToolButton Left = 206 - Top = 2 + Top = 0 Action = actRefresh AutoSize = True DropdownMenu = popupRefresh @@ -125,68 +126,68 @@ object MainForm: TMainForm end object ButtonUserManager: TToolButton Left = 250 - Top = 2 + Top = 0 Action = actUserManager AutoSize = True end object ButtonImportTextfile: TToolButton Left = 279 - Top = 2 + Top = 0 Action = actImportCSV AutoSize = True end object ButtonExport: TToolButton Left = 308 - Top = 2 + Top = 0 Action = actExportTables AutoSize = True end object tlbSep6: TToolButton Left = 337 Height = 28 - Top = 2 + Top = 0 Caption = 'tlbSep6' ImageIndex = 97 Style = tbsSeparator end object btnSQLHelp: TToolButton Left = 345 - Top = 2 + Top = 0 Action = actSQLhelp end object ToolButton3: TToolButton Left = 374 - Top = 2 + Top = 0 Action = actDataFirst end object ToolButton4: TToolButton Left = 403 - Top = 2 + Top = 0 Action = actDataLast end object ToolButton7: TToolButton Left = 432 - Top = 2 + Top = 0 Action = actDataInsert end object ToolButton8: TToolButton Left = 461 - Top = 2 + Top = 0 Action = actDataDelete end object ToolButton10: TToolButton Left = 490 - Top = 2 + Top = 0 Action = actDataPostChanges end object ToolButton1: TToolButton Left = 519 - Top = 2 + Top = 0 Action = actDataCancelChanges end object btnExecuteQuery: TToolButton Left = 548 - Top = 2 + Top = 0 Action = actExecuteQuery AutoSize = True DropdownMenu = popupExecuteQuery @@ -194,7 +195,7 @@ object MainForm: TMainForm end object btnLoadSQL: TToolButton Left = 592 - Top = 2 + Top = 0 Action = actLoadSQL AutoSize = True DropdownMenu = PopupQueryLoad @@ -202,70 +203,70 @@ object MainForm: TMainForm end object btnSaveSQL: TToolButton Left = 636 - Top = 2 + Top = 0 Action = actSaveSQL end object btnSaveSQLSnippet: TToolButton Left = 665 - Top = 2 + Top = 0 Action = actSaveSQLSnippet end object btnQueryFind: TToolButton Left = 694 - Top = 2 + Top = 0 Action = actQueryFind end object btnQueryReplace: TToolButton Left = 723 - Top = 2 + Top = 0 Action = actQueryReplace end object btnReformatSQL: TToolButton Left = 752 - Top = 2 + Top = 0 Action = actReformatSQL end object btnStopOnErrors: TToolButton Left = 781 - Top = 2 + Top = 0 Action = actQueryStopOnErrors end object btnBlobAsText: TToolButton Left = 810 - Top = 2 + Top = 0 Action = actBlobAsText end object btnQueryWordwrap: TToolButton Left = 839 - Top = 2 + Top = 0 Action = actQueryWordWrap end object ToolButton11: TToolButton Left = 868 - Top = 2 + Top = 0 Action = actCodeFolding end object btnSetDelimiter: TToolButton Left = 897 - Top = 2 + Top = 0 Action = actSetDelimiter end object btnCancelOperation: TToolButton Left = 926 - Top = 2 + Top = 0 Action = actCancelOperation end object ToolButton2: TToolButton Left = 955 Height = 28 - Top = 2 + Top = 0 Caption = 'ToolButton2' Style = tbsDivider end object btnDonate: TToolButton Left = 960 Hint = 'Send an arbitrary amount as donation to the author - per PayPal (also supports credit cards)' - Top = 2 + Top = 0 Caption = 'btnDonate' ImageIndex = 185 OnClick = DonateClick @@ -751,31 +752,31 @@ object MainForm: TMainForm end object panelTop: TPanel Left = 0 - Height = 330 - Top = 30 + Height = 332 + Top = 28 Width = 998 Align = alClient AutoSize = True BevelOuter = bvNone - ClientHeight = 330 + ClientHeight = 332 ClientWidth = 998 TabOrder = 4 OnDblClick = panelTopDblClick object pnlLeft: TPanel Left = 0 - Height = 330 + Height = 332 Top = 0 Width = 212 Align = alLeft BevelOuter = bvNone - ClientHeight = 330 + ClientHeight = 332 ClientWidth = 212 TabOrder = 0 OnResize = pnlLeftResize object pnlPreview: TPanel Left = 0 Height = 147 - Top = 183 + Top = 185 Width = 212 Align = alBottom BevelOuter = bvNone @@ -858,7 +859,7 @@ object MainForm: TMainForm Cursor = crVSplit Left = 0 Height = 6 - Top = 177 + Top = 179 Width = 212 Align = alBottom ResizeAnchor = akBottom @@ -943,7 +944,7 @@ object MainForm: TMainForm AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom Left = 0 - Height = 149 + Height = 151 Top = 28 Width = 212 Align = alClient @@ -996,24 +997,24 @@ object MainForm: TMainForm end object spltDBtree: TSplitter Left = 212 - Height = 330 + Height = 332 Top = 0 Width = 6 end object pnlRight: TPanel Left = 218 - Height = 330 + Height = 332 Top = 0 Width = 780 Align = alClient BevelOuter = bvNone - ClientHeight = 330 + ClientHeight = 332 ClientWidth = 780 TabOrder = 2 object pnlFilterVT: TPanel Left = 0 Height = 40 - Top = 290 + Top = 292 Width = 780 Align = alBottom AutoSize = True @@ -1088,15 +1089,15 @@ object MainForm: TMainForm end object PageControlMain: TPageControl Left = 0 - Height = 290 + Height = 292 Top = 0 Width = 780 - ActivePage = tabQuery + ActivePage = tabHost Align = alClient HotTrack = True Images = ImageListMain PopupMenu = popupMainTabs - TabIndex = 4 + TabIndex = 0 TabOrder = 1 OnChange = PageControlMainChange OnChanging = PageControlMainChanging @@ -1105,12 +1106,12 @@ object MainForm: TMainForm OnMouseUp = PageControlMainMouseUp object tabHost: TTabSheet Caption = 'Host' - ClientHeight = 257 + ClientHeight = 259 ClientWidth = 772 ImageIndex = 1 object PageControlHost: TPageControl Left = 0 - Height = 257 + Height = 259 Top = 0 Width = 772 ActivePage = tabCommandStats @@ -1122,12 +1123,12 @@ object MainForm: TMainForm OnChange = PageControlHostChange object tabDatabases: TTabSheet Caption = 'Databases' - ClientHeight = 224 + ClientHeight = 226 ClientWidth = 764 ImageIndex = 5 object ListDatabases: TLazVirtualStringTree Left = 0 - Height = 224 + Height = 226 Top = 0 Width = 764 Align = alClient @@ -1214,12 +1215,12 @@ object MainForm: TMainForm end object tabVariables: TTabSheet Caption = 'Variables' - ClientHeight = 224 + ClientHeight = 226 ClientWidth = 764 ImageIndex = 137 object ListVariables: TLazVirtualStringTree Left = 0 - Height = 224 + Height = 226 Top = 0 Width = 764 Align = alClient @@ -1271,12 +1272,12 @@ object MainForm: TMainForm end object tabStatus: TTabSheet Caption = 'Status' - ClientHeight = 224 + ClientHeight = 226 ClientWidth = 764 ImageIndex = 13 object ListStatus: TLazVirtualStringTree Left = 0 - Height = 224 + Height = 226 Top = 0 Width = 764 Align = alClient @@ -1334,13 +1335,13 @@ object MainForm: TMainForm end object tabProcesslist: TTabSheet Caption = 'Processes' - ClientHeight = 224 + ClientHeight = 226 ClientWidth = 764 ImageIndex = 57 object pnlProcessViewBox: TPanel Left = 0 Height = 69 - Top = 155 + Top = 157 Width = 764 Align = alBottom BevelOuter = bvNone @@ -1826,14 +1827,14 @@ object MainForm: TMainForm Cursor = crVSplit Left = 0 Height = 6 - Top = 149 + Top = 151 Width = 764 Align = alBottom ResizeAnchor = akBottom end object ListProcesses: TLazVirtualStringTree Left = 0 - Height = 149 + Height = 151 Top = 0 Width = 764 Align = alClient @@ -1910,12 +1911,12 @@ object MainForm: TMainForm end object tabCommandStats: TTabSheet Caption = 'Command-Statistics' - ClientHeight = 224 + ClientHeight = 226 ClientWidth = 764 ImageIndex = 145 object ListCommandStats: TLazVirtualStringTree Left = 0 - Height = 224 + Height = 226 Top = 0 Width = 764 Align = alClient @@ -1981,12 +1982,12 @@ object MainForm: TMainForm end object tabDatabase: TTabSheet Caption = 'Database' - ClientHeight = 257 + ClientHeight = 259 ClientWidth = 772 ImageIndex = 5 object ListTables: TLazVirtualStringTree Left = 0 - Height = 257 + Height = 259 Top = 0 Width = 772 Align = alClient @@ -2141,12 +2142,12 @@ object MainForm: TMainForm end object tabData: TTabSheet Caption = 'Data' - ClientHeight = 257 + ClientHeight = 259 ClientWidth = 772 ImageIndex = 41 object lblSorryNoData: TLabel Left = 0 - Height = 128 + Height = 130 Top = 129 Width = 772 Align = alClient @@ -2806,7 +2807,7 @@ object MainForm: TMainForm MouseSelActions = <> Options = [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces] VisibleSpecialChars = [vscSpace, vscTabAtLast] - ScrollBars = ssNone + ScrollBars = ssAutoBoth SelectedColor.BackPriority = 50 SelectedColor.ForePriority = 50 SelectedColor.FramePriority = 50 @@ -2833,7 +2834,7 @@ object MainForm: TMainForm end object DataGrid: TLazVirtualStringTree Left = 2 - Height = 124 + Height = 126 Top = 131 Width = 768 Align = alClient @@ -2883,7 +2884,7 @@ object MainForm: TMainForm end object tabQuery: TTabSheet Caption = 'Query' - ClientHeight = 257 + ClientHeight = 259 ClientWidth = 772 ImageIndex = 57 object pnlQueryMemo: TPanel @@ -3002,6 +3003,7 @@ object MainForm: TMainForm OnMouseWheel = AnySynMemoMouseWheel BookMarkOptions.BookmarkImages = ImageListSynBookMarks BookMarkOptions.Xoffset = 0 + BorderStyle = bsNone Gutter.Width = 65 Gutter.MouseActions = <> RightGutter.Width = 0 @@ -3422,6 +3424,7 @@ object MainForm: TMainForm Options = [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoKeepCaretX, eoShowScrollHint, eoTabIndent] VisibleSpecialChars = [vscSpace, vscTabAtLast] RightEdge = 800 + ScrollBars = ssAutoBoth SelectedColor.BackPriority = 50 SelectedColor.ForePriority = 50 SelectedColor.FramePriority = 50 @@ -3503,7 +3506,7 @@ object MainForm: TMainForm end object QueryGrid: TLazVirtualStringTree Left = 0 - Height = 89 + Height = 91 Top = 168 Width = 772 Align = alClient diff --git a/source/main.pas b/source/main.pas index 136e2b0e..39097cb2 100644 --- a/source/main.pas +++ b/source/main.pas @@ -13263,6 +13263,7 @@ begin LineNumberPart.LeftOffset := 2; LineNumberPart.MarkupInfo.Foreground := clGrayText; end; + Editor.BorderStyle := BaseEditor.BorderStyle; Editor.BookMarkOptions.BookmarkImages := ImageListSynBookMarks; //Editor.Gutter.BorderColor := GetThemeColor(clWindow); //Editor.Gutter.Font.Name := Editor.Font.Name; @@ -13282,6 +13283,7 @@ begin if Assigned(CodeFoldingPart) then begin CodeFoldingPart.Visible := actCodeFolding.Checked; end; + Editor.ScrollBars := BaseEditor.ScrollBars; end; Editor.LineHighlightColor.Background := StringToColor(AppSettings.ReadString(asSQLColActiveLine)); Editor.Options := BaseEditor.Options;