Merge pull request #954 from wise0704/ScrollBarEx

Improved ScrollBarEx

Author: Meychi

.gitignore

@@ -23,3 +23,4 @@ PluginCore/Bin
 /FlashDevelop/Bin/Debug/Settings/Recovery
 /FlashDevelop/Bin/Debug/Exceptions.log
 /FlashDevelop/Bin/Debug/Tools/fdbuild/fdbuild.exe
+FlashDevelop/Bin/Debug/Settings/Themes/CURRENT

FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi

@@ -62,13 +62,18 @@ VS2005AutoHideStrip.TabUnderlineColor=#ff0000
 # Default (Hover), Click
 DockPanel.ShowAutoHideContentOn=Hover
 
-#ScrollBar.ForeColor=#686A68
-#ScrollBar.BackColor=#A8ACAA
-#ScrollBar.BorderColor=#A8ACAA
-#ScrollBar.ActiveForeColor=#485253
-#ScrollBar.DisabledBackColor=#333F42
-#ScrollBar.DisabledBorderColor=#666D73
-#ScrollBar.CurrentPositionColor=#804000
+ScrollBar.UseCustom=False
+#ScrollBar.ForeColor=#D0D1D7
+#ScrollBar.BackColor=#E8E8EC
+#ScrollBar.BorderColor=#E8E8EC
+#ScrollBar.HotForeColor=#888888
+#ScrollBar.ActiveForeColor=#6A6A6A
+#ScrollBar.ArrowColor=#868999
+#ScrollBar.HotArrowColor=#1C97EA
+#ScrollBar.ActiveArrowColor=#007ACC
+#ScrollBar.DisabledBackColor=#C0C0C0
+#ScrollBar.DisabledBorderColor=#888888
+#ScrollBar.CurrentPositionColor=#0000CD
 
 #LinkLabel.LinkColor=#ff0000
 #LinkLabel.ActiveLinkColor=#00ff00

FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi

@@ -62,13 +62,18 @@ VS2005AutoHideStrip.TabUnderlineColor=#ff0000
 # Default (Hover), Click
 DockPanel.ShowAutoHideContentOn=Hover
 
-#ScrollBar.ForeColor=#686A68
-#ScrollBar.BackColor=#A8ACAA
-#ScrollBar.BorderColor=#A8ACAA
-#ScrollBar.ActiveForeColor=#485253
-#ScrollBar.DisabledBackColor=#333F42
-#ScrollBar.DisabledBorderColor=#666D73
-#ScrollBar.CurrentPositionColor=#804000
+ScrollBar.UseCustom=False
+#ScrollBar.ForeColor=#D0D1D7
+#ScrollBar.BackColor=#E8E8EC
+#ScrollBar.BorderColor=#E8E8EC
+#ScrollBar.HotForeColor=#888888
+#ScrollBar.ActiveForeColor=#6A6A6A
+#ScrollBar.ArrowColor=#868999
+#ScrollBar.HotArrowColor=#1C97EA
+#ScrollBar.ActiveArrowColor=#007ACC
+#ScrollBar.DisabledBackColor=#C0C0C0
+#ScrollBar.DisabledBorderColor=#888888
+#ScrollBar.CurrentPositionColor=#0000CD
 
 #LinkLabel.LinkColor=#ff0000
 #LinkLabel.ActiveLinkColor=#00ff00

FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi

@@ -62,10 +62,15 @@ VS2005AutoHideStrip.TabUnderlineColor=#6D767C
 # Default (Hover), Click
 DockPanel.ShowAutoHideContentOn=Hover
 
+ScrollBar.UseCustom=True
 ScrollBar.ForeColor=#686A68
 ScrollBar.BackColor=#A8ACAA
 ScrollBar.BorderColor=#A8ACAA
+#ScrollBar.HotForeColor=#XXXXXX
 ScrollBar.ActiveForeColor=#485253
+#ScrollBar.ArrowColor=#XXXXXX
+#ScrollBar.HotArrowColor=#XXXXXX
+#ScrollBar.ActiveArrowColor=#XXXXXX
 ScrollBar.DisabledBackColor=#A8ACAA
 ScrollBar.DisabledBorderColor=#A8ACAA
 ScrollBar.CurrentPositionColor=#804000

FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi

@@ -62,10 +62,15 @@ VS2005AutoHideStrip.TabUnderlineColor=#7B7675
 # Default (Hover), Click
 DockPanel.ShowAutoHideContentOn=Hover
 
+ScrollBar.UseCustom=True
 ScrollBar.ForeColor=#4B4645
 ScrollBar.BackColor=#7B7675
 ScrollBar.BorderColor=#7B7675
+#ScrollBar.HotForeColor=#XXXXXX
 ScrollBar.ActiveForeColor=#333333
+#ScrollBar.ArrowColor=#XXXXXX
+#ScrollBar.HotArrowColor=#XXXXXX
+#ScrollBar.ActiveArrowColor=#XXXXXX
 ScrollBar.DisabledBackColor=#7B7675
 ScrollBar.DisabledBorderColor=#7B7675
 ScrollBar.CurrentPositionColor=#F0AC62

FlashDevelop/Settings/Accessors.cs

@@ -7,6 +7,7 @@
 using System.Xml.Serialization;
 using Ookii.Dialogs;
 using PluginCore;
+using PluginCore.Controls;
 using PluginCore.Localization;
 using ScintillaNet.Enums;
 
@@ -372,7 +373,7 @@ public HighlightMatchingWordsMode HighlightMatchingWordsMode
         [LocalizedDescription("FlashDevelop.Description.HighlightMatchingWordsDelay")]
         public Int32 HighlightMatchingWordsDelay
         {
-            get 
+            get
             {
                 // Make sure this is not an invalid value
                 if (this.highlightMatchingWordsDelay <= 0) this.highlightMatchingWordsDelay = 1200;
@@ -445,10 +446,10 @@ public Boolean TabIndents
         [LocalizedDescription("FlashDevelop.Description.IndentView")]
         public IndentView IndentView
         {
-            get 
+            get
             {
                 if ((Int32)this.indentView == 0) this.indentView = IndentView.Real;
-                return this.indentView; 
+                return this.indentView;
             }
             set
             {

FlashDevelop/Settings/Properties.cs

@@ -9,6 +9,7 @@
 using System.Windows.Forms;
 using PluginCore.Managers;
 using PluginCore;
+using PluginCore.Controls;
 
 namespace FlashDevelop.Settings
 {
@@ -103,7 +104,6 @@ public partial class SettingObject : ISettings
         private Boolean uiWrapList = false;
         private Boolean uiDisableSmartMatch = false;
         private String uiInsertionTriggers = "";
-
     }
 
 }