Up/Down arrows on search btns. Match case for highlights.

BenLand100 · Jul 13, 2016 · a3aa35c · a3aa35c
1 parent eab562f
commit a3aa35c
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 19 deletions.
diff --git a/Projects/Simba/simbaunit.lfm b/Projects/Simba/simbaunit.lfm
@@ -343,9 +343,9 @@ object SimbaForm: TSimbaForm
       TabOrder = 1
       Visible = False
       object SpeedButtonSearch: TSpeedButton
-        Left = 32
+        Left = 24
         Height = 19
-        Top = 7
+        Top = 12
         Width = 16
         Flat = True
         Glyph.Data = {
@@ -428,18 +428,18 @@ object SimbaForm: TSimbaForm
       end
       object LabeledEditSearch: TLabeledEdit
         Left = 104
-        Height = 23
+        Height = 30
         Top = 6
-        Width = 80
+        Width = 192
         EditLabel.AnchorSideTop.Control = LabeledEditSearch
         EditLabel.AnchorSideTop.Side = asrCenter
         EditLabel.AnchorSideRight.Control = LabeledEditSearch
         EditLabel.AnchorSideBottom.Control = LabeledEditSearch
         EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 72
-        EditLabel.Height = 15
-        EditLabel.Top = 10
-        EditLabel.Width = 29
+        EditLabel.Left = 59
+        EditLabel.Height = 18
+        EditLabel.Top = 12
+        EditLabel.Width = 42
         EditLabel.Caption = 'Find: '
         EditLabel.ParentColor = False
         LabelPosition = lpLeft
@@ -451,27 +451,29 @@ object SimbaForm: TSimbaForm
         OnKeyPress = LabeledEditSearchKeyPress
       end
       object CheckBoxMatchCase: TCheckBox
-        Left = 200
-        Height = 19
-        Top = 8
-        Width = 80
+        Left = 376
+        Height = 22
+        Top = 10
+        Width = 110
         Caption = 'Match case'
         OnClick = CheckBoxMatchCaseClick
         TabOrder = 1
       end
       object SpeedButtonFindNext: TSpeedButton
         Left = 304
-        Height = 22
-        Top = 7
-        Width = 56
+        Height = 26
+        Top = 8
+        Width = 26
         Action = ActionFindNext
+        Caption = '▿'
       end
       object SpeedButtonFindPrev: TSpeedButton
-        Left = 368
-        Height = 22
+        Left = 336
+        Height = 26
         Top = 8
-        Width = 64
+        Width = 26
         Action = ActionFindPrev
+        Caption = '▵'
       end
     end
     object SplitterFunctionList: TSplitter
@@ -512,6 +514,83 @@ object SimbaForm: TSimbaForm
         ClientWidth = 150
         inherited ClearSearch: TSpeedButton
           Left = 120
+          Caption = ''
+          Glyph.Data = {
+            36090000424D3609000000000000360000002800000018000000180000000100
+            2000000000000009000064000000640000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            00FF0000000000000000000000000000000000000000000000FF000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000FF0000
+            00FF000000FF000000000000000000000000000000FF000000FF000000FF0000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            00FF000000FF000000FF00000000000000FF000000FF000000FF000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000FF000000FF000000FF000000FF000000FF00000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            000000000000000000FF000000FF000000FF0000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000FF000000FF000000FF000000FF000000FF00000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            00FF000000FF000000FF00000000000000FF000000FF000000FF000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000FF0000
+            00FF000000FF000000000000000000000000000000FF000000FF000000FF0000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            00FF0000000000000000000000000000000000000000000000FF000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000000000000000
+            0000000000000000000000000000000000000000000000000000
+          }
         end
         inherited editSearchList: TEdit
           Width = 119

diff --git a/Projects/Simba/simbaunit.pas b/Projects/Simba/simbaunit.pas
@@ -1650,7 +1650,7 @@ procedure TSimbaForm.DoSearch(SearchOptions: TSynSearchOptions; HighlightAll: Bo
     begin
       HighlightAllColor.Background:= clYellow;
       if HighlightAll then
-        SetHighlightSearch(SearchString,[])
+        SetHighlightSearch(SearchString, SearchOptions)
       else
         SetHighlightSearch('',[]);
     end;