Merge pull request #101 from sgapollo/master

51, 71

Author: FMXExpress

Lang/English.lng

@@ -351,10 +351,12 @@ Ver=1
 27006=Sets to System HighlightText value
 27007=Sets to WhiteSpace value
 27008=Show function hints
+27070=New Document Encoding:
 27009=Hint: use Ctrl+Scroll to edit text size
 27010=Editor
 27011=Font:
 27012=Size:
+27012=Use font ligatures is available
 27013=Editor Font
 27014=Gutter
 27015=Auto size
@@ -938,7 +940,8 @@ Ver=1
 62016=Question
 62017=Compilation successful
 62018=Compilation aborted by user
-62019=Line:%6d               Col:%6d               Sel:%6d               Lines:%6d               Length:%6d
+62019=Line:%20d Col:%20d Sel:%20d Lines:%20d Length:%20d
+62019_1=Line:%6d               Col:%6d               Sel:%6d               Lines:%6d               Length:%6d
 62020=Done parsing
 62021=Found %d matches
 62022=Done parsing in %g seconds
@@ -1256,6 +1259,4 @@ Ver=1
 79018=Could not find AStyle
 79019=Powered by %s
 79020=Max. line length:
-79021=// Could not find the AStyle output file:<CR>// %s
-79022=Use font ligatures is available
-79023=New Document Encoding:
+79021=// Could not find the AStyle output file:<CR>// %s

Source/Editor.pas

@@ -1553,6 +1553,7 @@ procedure TEditor.InitCompletion;
 begin
   fCompletionBox := MainForm.CodeCompletion;
   fCompletionBox.Enabled := devCodeCompletion.Enabled;
+  fCompletionBox.Color := devCodeCompletion.BackColor;
 
   if devEditor.ShowFunctionTip then begin
     if not Assigned(fFunctionTipTimer) then

Source/EditorOptFrm.pas

@@ -341,6 +341,12 @@ procedure TEditorOptForm.FormCreate(Sender: TObject);
         try
           StrtoAttr(Attribute, devEditor.Syntax.Values[AttrName]);
           cpp.Attribute[I].Assign(Attribute);
+
+          if SameText(cpp.Attribute[I].Name, 'WhiteSpace') or SameText(cpp.Attribute[I].Name, 'Space') then begin
+            cpCompletionBackground.NoneColorColor := cpp.Attribute[I].Background;
+            cpCompletionBackground.DefaultColorColor := cpp.Attribute[I].Background;
+          end;
+
         finally
           Attribute.Free;
         end;
@@ -406,7 +412,14 @@ procedure TEditorOptForm.FormCreate(Sender: TObject);
   chkCBParseLocalH.Checked := devCodeCompletion.ParseLocalHeaders;
   chkCBParseGlobalH.Checked := devCodeCompletion.ParseGlobalHeaders;
   tbCompletionDelay.Position := devCodeCompletion.Delay;
-  cpCompletionBackground.Selected := devCodeCompletion.BackColor;
+
+  cpCompletionBackground.Items.InsertObject(1, 'Default', TObject(cpCompletionBackground.DefaultColorColor));
+
+  if cpCompletionBackground.DefaultColorColor = devCodeCompletion.BackColor then
+    cpCompletionBackground.ItemIndex := 1
+  else
+    cpCompletionBackground.Selected := devCodeCompletion.BackColor;
+
   chkEnableCompletionClick(nil);
 
   // Symbol Completion
@@ -438,7 +451,6 @@ procedure TEditorOptForm.FormCreate(Sender: TObject);
   // Set defaults of color buttons, don't want all system colors too
   cpMarginColor.Items.InsertObject(1, 'Default', TObject(cpMarginColor.DefaultColorColor));
   cpHighColor.Items.InsertObject(1, 'Default', TObject(cpHighColor.DefaultColorColor));
-  cpCompletionBackground.Items.InsertObject(1, 'Default', TObject(cpCompletionBackground.DefaultColorColor));
 end;
 
 procedure TEditorOptForm.cboEditorFontDrawItem(Control: TWinControl; Index: Integer; Rect: TRect; State:
@@ -823,7 +835,11 @@ procedure TEditorOptForm.btnOkClick(Sender: TObject);
   with devCodeCompletion do begin
     Enabled := chkEnableCompletion.Checked;
     Delay := tbCompletionDelay.Position;
-    BackColor := cpCompletionBackground.Selected;
+    if cpCompletionBackground.ItemIndex = 1 then
+      BackColor := cpCompletionBackground.DefaultColorColor
+    else
+      BackColor := cpCompletionBackground.Selected;
+
     ParseLocalHeaders := chkCBParseLocalH.Checked;
     ParseGlobalHeaders := chkCBParseGlobalH.Checked;
   end;
@@ -989,9 +1005,13 @@ procedure TEditorOptForm.StyleChange(Sender: TObject);
       Background := cpBackground.Selected;
 
       // Update default color
-      if SameText(Name, 'WhiteSpace') then begin
+      if SameText(Attr.Name, 'WhiteSpace') or SameText(Attr.Name, 'Space') then begin
         ffgColor := Foreground;
         fbgColor := Background;
+
+        cpCompletionBackground.NoneColorColor := Background;
+        cpCompletionBackground.DefaultColorColor := Background;
+        cpCompletionBackground.Items.Objects[1] := TObject(Background);
       end;
 
       Style := [];
@@ -1106,10 +1126,17 @@ procedure TEditorOptForm.cboQuickColorSelect(Sender: TObject);
 
     offset := cboQuickColor.ItemIndex * 1000;
     for i := 0 to pred(cpp.AttrCount) do begin
-      attr := TSynHighlighterAttributes.Create(cpp.Attribute[i].Name,cpp.Attribute[i].Name);
+      attr := TSynHighlighterAttributes.Create(cpp.Attribute[i].Name, cpp.Attribute[i].Name);
       try
         StrtoAttr(Attr, LoadStr(i + offset + 1));
         cpp.Attribute[i].Assign(Attr);
+
+        if SameText(Attr.Name, 'WhiteSpace') or SameText(Attr.Name, 'Space') then begin
+          cpCompletionBackground.NoneColorColor := Attr.Background;
+          cpCompletionBackground.DefaultColorColor := Attr.Background;
+          cpCompletionBackground.Items.Objects[1] := TObject(Attr.Background);
+        end;
+
       finally
         Attr.Free;
       end;

Source/LangIDs.inc

@@ -376,7 +376,7 @@ const
   ID_EOPT_AUTOINDENT2                   = 26028;
   ID_EOPT_ADDINDENT                     = 26029;
   ID_EOPT_TABS                          = 26030;
-  
+
   ID_EOPT_SPECIALCHARS                  = 27001;
   ID_EOPT_PARSERHINTS                   = 27002;
   ID_EOPT_MATCH                         = 27003;
@@ -385,12 +385,14 @@ const
   ID_EOPT_HINTHIGHLIGHT                 = 27006;
   ID_EOPT_HINTWHITESPACE                = 27007;
   ID_EOPT_CLOSEBRACE                    = 27008;
+  ID_EOPT_NEWDOCENCODING                = 27070;
 
   // Display Tab
   ID_EOPT_CTRLSCROLLHINT                = 27009;
   ID_EOPT_EDFONT                        = 27010;
   ID_EOPT_FONT                          = 27011;
   ID_EOPT_SIZE                          = 27012;
+  ID_EOPT_LIGATURE                      = 27071;
   ID_EOPT_EDITORPRE                     = 27013;
   ID_EOPT_GUTTER                        = 27014;
   ID_EOPT_GUTTERAUTO                    = 27015;
@@ -411,7 +413,6 @@ const
   ID_EOPT_ELEMENTS                      = 27028;
   ID_EOPT_SAVESYNTAX                    = 27029;
 
-
   // Code Tab -- Inserts
   ID_EOPT_CICODE                        = 27030;
   ID_EOPT_CIMENU                        = 27031;
@@ -1310,6 +1311,3 @@ const
   ID_FORMATTER_POWEREDBY                = 79019;
   ID_FORMATTER_MAXLINELENGTH            = 79020;
   ID_FORMATTER_LOADERROR                = 79021;
-
-  ID_EOPT_LIGATURE                      = 79022;
-  ID_EOPT_NEWDOCENCODING                = 79023;

Source/VCL/ClassBrowsing/CodeCompletionForm.dfm

@@ -3,9 +3,27 @@ object CodeComplForm: TCodeComplForm
   Top = 305
   BorderIcons = []
   BorderStyle = bsNone
-  ClientHeight = 286
+  ClientHeight = 230
   ClientWidth = 472
-  Color = clBtnFace
+  Color = clDefault
+  CustomTitleBar.Enabled = True
+  CustomTitleBar.SystemHeight = False
+  CustomTitleBar.ShowCaption = False
+  CustomTitleBar.ShowIcon = False
+  CustomTitleBar.SystemColors = False
+  CustomTitleBar.SystemButtons = False
+  CustomTitleBar.BackgroundColor = clWhite
+  CustomTitleBar.ForegroundColor = 65793
+  CustomTitleBar.InactiveBackgroundColor = clWhite
+  CustomTitleBar.InactiveForegroundColor = 10066329
+  CustomTitleBar.ButtonForegroundColor = 65793
+  CustomTitleBar.ButtonBackgroundColor = clWhite
+  CustomTitleBar.ButtonHoverForegroundColor = 65793
+  CustomTitleBar.ButtonHoverBackgroundColor = 16053492
+  CustomTitleBar.ButtonPressedForegroundColor = 65793
+  CustomTitleBar.ButtonPressedBackgroundColor = 15395562
+  CustomTitleBar.ButtonInactiveForegroundColor = 10066329
+  CustomTitleBar.ButtonInactiveBackgroundColor = clWhite
   Constraints.MinHeight = 128
   Constraints.MinWidth = 256
   Font.Charset = DEFAULT_CHARSET
@@ -14,17 +32,37 @@ object CodeComplForm: TCodeComplForm
   Font.Name = 'Courier New'
   Font.Style = []
   FormStyle = fsStayOnTop
+  GlassFrame.Enabled = True
+  GlassFrame.Top = 1
   KeyPreview = True
   OldCreateOrder = False
+  StyleElements = [seFont]
   OnDeactivate = FormDeactivate
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 16
-  object lbCompletion: TListBox
+  object Bevel1: TBevel
     Left = 0
     Top = 0
     Width = 472
-    Height = 286
+    Height = 230
+    Align = alClient
+    Shape = bsFrame
+    ExplicitLeft = 208
+    ExplicitTop = 88
+    ExplicitWidth = 50
+    ExplicitHeight = 50
+  end
+  object lbCompletion: TListBox
+    AlignWithMargins = True
+    Left = 5
+    Top = 5
+    Width = 462
+    Height = 220
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Style = lbOwnerDrawFixed
     AutoComplete = False
     Align = alClient
@@ -37,11 +75,15 @@ object CodeComplForm: TCodeComplForm
     Font.Height = -13
     Font.Name = 'Courier New'
     Font.Style = []
-    ItemHeight = 16
     ParentFont = False
     TabOrder = 0
+    StyleElements = [seFont, seBorder]
     OnDblClick = lbCompletionDblClick
     OnDrawItem = lbCompletionDrawItem
     OnKeyPress = lbCompletionKeyPress
+    ExplicitLeft = 8
+    ExplicitTop = -2
+    ExplicitWidth = 466
+    ExplicitHeight = 224
   end
 end

Source/VCL/ClassBrowsing/CodeCompletionForm.pas

@@ -24,7 +24,7 @@ interface
 uses
 {$IFDEF WIN32}
   Windows, Classes, Graphics, Forms, StdCtrls, Controls,
-  CodeCompletion, CppParser, CBUtils;
+  CodeCompletion, CppParser, CBUtils, Winapi.Messages, Vcl.ExtCtrls;
 {$ENDIF}
 {$IFDEF LINUX}
 Xlib, SysUtils, Classes, QGraphics, QForms, QStdCtrls, QControls,
@@ -34,6 +34,7 @@ interface
 type
   TCodeComplForm = class(TForm)
     lbCompletion: TListBox;
+    Bevel1: TBevel;
     procedure FormShow(Sender: TObject);
     procedure FormDeactivate(Sender: TObject);
     procedure lbCompletionDblClick(Sender: TObject);
@@ -42,6 +43,9 @@   TCodeComplForm = class(TForm)
   private
     { Private declarations }
     fOwner: TCodeCompletion;
+
+  protected
+    procedure WMNCHitTest(var Message: TWMNCHitTest); message WM_NCHITTEST;
   public
     constructor Create(AOwner: TComponent); override;
     procedure CreateParams(var Params: TCreateParams); override;
@@ -58,6 +62,8 @@ procedure TCodeComplForm.FormShow(Sender: TObject);
 begin
   Width := fOwner.Width;
   Height := fOwner.Height;
+  Color := fOwner.Color;
+  lbCompletion.Color := fOwner.Color;
   lbCompletion.DoubleBuffered := true; // performance hit, but reduces flicker a lit
 end;
 
@@ -70,7 +76,7 @@ procedure TCodeComplForm.CreateParams(var Params: TCreateParams);
 begin
   inherited CreateParams(Params);
 
-  Params.Style := Params.Style or WS_SIZEBOX;
+//  Params.Style := Params.Style or WS_SIZEBOX;
 end;
 
 constructor TCodeComplForm.Create(AOwner: TComponent);
@@ -151,5 +157,43 @@ procedure TCodeComplForm.lbCompletionKeyPress(Sender: TObject; var Key: Char);
     fOwner.OnKeyPress(self, Key);
 end;
 
+procedure TCodeComplForm.WMNCHitTest(var Message: TWMNCHitTest);
+var
+  D: Integer;
+  P: TPoint;
+begin
+
+  D := GetSystemMetrics(SM_CXSIZEFRAME);
+
+  P := Self.ScreenToClient(Message.Pos);
+
+  if P.Y < D then
+  begin
+    if P.X < D then
+      Message.Result := HTTOPLEFT
+    else if P.X > ClientWidth - D then
+      Message.Result := HTTOPRIGHT
+    else
+      Message.Result := HTTOP;
+  end
+  else if P.Y > ClientHeight - D then
+  begin
+    if P.X < D then
+      Message.Result := HTBOTTOMLEFT
+    else if P.X > ClientWidth - D then
+      Message.Result := HTBOTTOMRIGHT
+    else
+      Message.Result := HTBOTTOM;
+  end
+  else
+  begin
+    if P.X < D then
+      Message.Result := HTLEFT
+    else if P.X > ClientWidth - D then
+      Message.Result := HTRIGHT
+  end;
+
+end;
+
 end.
 

Source/devCFG.pas

@@ -2563,7 +2563,6 @@ procedure TdevEditor.AssignEditor(editor: TSynEdit; const FileName: String);
         Options := Options + [eoTrimTrailingSpaces];
       if fShowLigatures then
         Options := Options + [eoShowLigatures];
-
     finally
       EndUpdate;
     end;
@@ -2596,7 +2595,7 @@ procedure TdevCodeCompletion.SettoDefaults;
   fWidth := 320;
   fHeight := 240;
   fDelay := 180;
-  fBackColor := clWindow;
+  fBackColor := clDefault;
   fEnabled := True;
   fParseLocalHeaders := True;
   fParseGlobalHeaders := True;