Merge pull request #15 from leafOfTree/dev

leafOfTree · web-flow · commit 976d0d9e3b99 · 2025-02-17T09:01:29.000+08:00
Enable mouse hover to activate tabs; add option for auto hide and align tabs
diff --git a/WtProgram/ManagerViewService/Views/BehaviorView.fs b/WtProgram/ManagerViewService/Views/BehaviorView.fs
@@ -28,11 +28,37 @@ type HotKeyView() =
 
     let settingsCheckbox key = checkBox(settingsProperty(key))
 
+    let dropDown (prop:IProperty<string>, items: string list) = 
+        let combo = new ComboBox()
+
+        // First add items
+        combo.Items.AddRange(items |> List.toArray |> Array.map box)
+        
+        // Then set initial value if exists, otherwise select first item
+        let initialIndex = 
+            match items |> List.tryFindIndex ((=) prop.value) with
+            | Some index -> index
+            | None -> if combo.Items.Count > 0 then 0 else -1
+        
+        if initialIndex >= 0 then
+            combo.SelectedIndex <- initialIndex
+            
+        combo.SelectedIndexChanged.Add(fun _ ->
+            if combo.SelectedIndex >= 0 then
+                prop.value <- combo.SelectedItem.ToString()
+        )
+
+        combo :> Control
+
+    let settingsDropDown key value = dropDown(settingsProperty(key), value)
+
     let basicForm = 
         let fields = List2([
             ("runAtStartup", settingsCheckbox "runAtStartup")
             ("hideInactiveTabs", settingsCheckbox "hideInactiveTabs")
             ("isTabbingEnabledForAllProcessesByDefault", checkBox(prop<IFilterService, bool>(Services.filter, "isTabbingEnabledForAllProcessesByDefault")))
+            ("autoHide", settingsCheckbox "autoHide")
+            ("alignment", settingsDropDown "alignment" ["Left"; "Center"; "Right"])
         ])
         "Basics", UIHelper.form fields
 
@@ -63,21 +89,14 @@ type HotKeyView() =
             editor.value <- Services.program.getHotKey(key)
             editor.changed.Add <| fun() ->
                 Services.program.setHotKey key (unbox<int>(editor.value))
-        
-        let checkBox (prop:IProperty<bool>) = 
-            let checkbox = BoolEditor() :> IPropEditor
-            checkbox.value <- box(prop.value)
-            checkbox.changed.Add <| fun() -> prop.value <- unbox<bool>(checkbox.value)
-            checkbox.control
-
-        let settingsCheckbox key = checkBox(settingsProperty(key))
 
         let fields = hotKeys.map <| fun(key,text) ->
             let editor = editors.find key
             text, editor.control
 
         let fields = fields.prependList(List2([
             ("enableCtrlNumberHotKey", settingsCheckbox "enableCtrlNumberHotKey")
+            ("enableHoverActivate", settingsCheckbox "enableHoverActivate")
         ]))
 
         "Switch Tabs", UIHelper.form fields
diff --git a/WtProgram/Properties/Resources.ja-JP.resx b/WtProgram/Properties/Resources.ja-JP.resx
@@ -165,6 +165,15 @@
   <data name="enableCtrlNumberHotKey" xml:space="preserve">
     <value>Ctrl+1、... Ctrl+9 でタブをアクティブ化を有効にする</value>
   </data>
+  <data name="enableHoverActivate" xml:space="preserve">
+    <value>マウスホバーでタブを有効にする</value>
+  </data>
+  <data name="autoHide" xml:space="preserve">
+    <value>最大化時にタブを自動的に隠す</value>
+  </data>
+  <data name="alignment" xml:space="preserve">
+    <value>タブの配置</value>
+  </data>
   <data name="Height" xml:space="preserve">
     <value>高さ</value>
   </data>
diff --git a/WtProgram/Properties/Resources.resx b/WtProgram/Properties/Resources.resx
@@ -163,7 +163,16 @@
     <value>Group windows in WindowTabs task switcher</value>
   </data>
   <data name="enableCtrlNumberHotKey" xml:space="preserve">
-    <value>Enable Ctrl+1, ...Ctrl+9 to active tab</value>
+    <value>Enable Ctrl+1, ...Ctrl+9 to activate tab</value>
+  </data>
+  <data name="enableHoverActivate" xml:space="preserve">
+    <value>Enable mouse hover to activate tab</value>
+  </data>
+  <data name="autoHide" xml:space="preserve">
+    <value>Auto hide tab when maximized</value>
+  </data>
+  <data name="alignment" xml:space="preserve">
+    <value>Align tabs</value>
   </data>
   <data name="Height" xml:space="preserve">
     <value>Height</value>
diff --git a/WtProgram/Settings.fs b/WtProgram/Settings.fs
@@ -86,7 +86,10 @@ type Settings(isStandAlone) as this =
                     replaceAltTab = settingsJson.getBool("replaceAltTab").def(false)
                     groupWindowsInSwitcher = settingsJson.getBool("groupWindowsInSwitcher").def(false)
                     enableCtrlNumberHotKey = settingsJson.getBool("enableCtrlNumberHotKey").def(true)
+                    enableHoverActivate = settingsJson.getBool("enableHoverActivate").def(false)
+                    autoHide = settingsJson.getBool("autoHide").def(true)
                     version = settingsJson.getString("version").def(String.Empty)
+                    alignment = settingsJson.getString("alignment").def("Center")
                     tabAppearance =
                         let appearanceObject = settingsJson.getObject("tabAppearance").def(JObject())
                         appearanceObject.items.fold this.defaultTabAppearance <| fun appearance (key,value) ->
@@ -105,6 +108,7 @@ type Settings(isStandAlone) as this =
             let settingsJson = this.settingsJson
             settingsJson.setString("version", settings.version)
             settingsJson.setString("licenseKey", settings.licenseKey)
+            settingsJson.setString("alignment", settings.alignment)
             settings.ticket.iter <| fun ticket -> settingsJson.setString("ticket", ticket)
             settingsJson.setBool("runAtStartup", settings.runAtStartup)
             settingsJson.setBool("hideInactiveTabs", settings.hideInactiveTabs)
@@ -113,6 +117,8 @@ type Settings(isStandAlone) as this =
             settingsJson.setBool("replaceAltTab", settings.replaceAltTab)
             settingsJson.setBool("groupWindowsInSwitcher", settings.groupWindowsInSwitcher)
             settingsJson.setBool("enableCtrlNumberHotKey", settings.enableCtrlNumberHotKey)
+            settingsJson.setBool("enableHoverActivate", settings.enableHoverActivate)
+            settingsJson.setBool("autoHide", settings.autoHide)
             settingsJson.setStringArray("includedPaths", settings.includedPaths.items)
             settingsJson.setStringArray("excludedPaths", settings.excludedPaths.items)
             settingsJson.setStringArray("autoGroupingPaths", settings.autoGroupingPaths.items)
diff --git a/WtProgram/Shared/ProgramTypes.fs b/WtProgram/Shared/ProgramTypes.fs
@@ -31,6 +31,9 @@ type SettingsRec = {
     groupWindowsInSwitcher: bool
     enableCtrlNumberHotKey: bool
     combineIconsInTaskbar: bool
+    enableHoverActivate: bool
+    autoHide: bool
+    alignment: string
     }
 
 type ILicenseManager =
diff --git a/WtProgram/TabStrip.fs b/WtProgram/TabStrip.fs
@@ -1,4 +1,4 @@
-﻿namespace Bemo
+namespace Bemo
 open System
 open System.Collections
 open System.Drawing
@@ -11,6 +11,7 @@ open Bemo.Win32.Forms
 
 type ITabStripMonitor =
     abstract member tabClick : (MouseButton * Tab * TabPart * MouseAction * Pt) -> unit
+    abstract member tabActivate : (Tab) -> unit
     abstract member tabClose : Tab -> unit
     abstract member tabMoved : Tab * int -> unit
     abstract member windowMsg : Win32Message -> unit
@@ -34,7 +35,18 @@ type TabStrip(monitor:ITabStripMonitor) as this =
     let showInsideCell = Cell.create(false)
     let isInAltTabCell = Cell.create(false)
     let iconOnlyCell = Cell.create(false)
-    let alignment = Cell.create(Map2(List2([(TabUp,TabLeft);(TabDown,TabCenter)])))
+    let alignmentMap = 
+        Map.ofList [
+            "Left", TabLeft
+            "Center", TabCenter
+            "Right", TabRight
+        ]
+    let alignmentDefault = 
+        let alignmentDefault = Services.settings.getValue("alignment").cast<string>()
+        match alignmentMap.TryFind alignmentDefault with
+        | Some align -> align
+        | None -> TabCenter
+    let alignment = Cell.create(Map2(List2([(TabUp,alignmentDefault);(TabDown,alignmentDefault)])))
     let capturedCell = Cell.create(None : Option<Tab*TabPart>)
     let hoverCell = Cell.create(None : Option<Tab*TabPart>)
     let slideCell = Cell.create(None)
@@ -67,7 +79,7 @@ type TabStrip(monitor:ITabStripMonitor) as this =
 
         Cell.listen <| fun() ->
             this.update()
-       
+
     member private this.inAltSwitch = isInAltTabCell.value
 
     member private this.layeredWindow = layeredWindowCell.value.Value
@@ -130,6 +142,10 @@ type TabStrip(monitor:ITabStripMonitor) as this =
             if this.window.hasCapture.not then 
                 this.window.trackMouseLeave()
             hoverCell.set(this.hit)
+            let enableHoverActivate = Services.settings.getValue("enableHoverActivate").cast<bool>()
+            if enableHoverActivate then 
+                this.hit.iter <| fun(hitTab, hitPart) ->
+                    monitor.tabActivate(hitTab)
         | MouseClick(pt, btn, action) ->
             this.setPt(Some(pt))
             this.hit.iter <| fun(hitTab, hitPart) ->
diff --git a/WtProgram/TabStripDecorator.fs b/WtProgram/TabStripDecorator.fs
@@ -167,7 +167,8 @@ type TabStripDecorator(group:WindowGroup) as this =
             })
 
         let autoHideItem =
-            let isEnabled = group.bb.read("autoHide", true)
+            let isAutoHideEnabledDef = Services.settings.getValue("autoHide").cast<bool>()
+            let isEnabled = group.bb.read("autoHide", isAutoHideEnabledDef)
             CmiRegular({
                 text = "Auto hide maximized"
                 flags = checked(isEnabled)
@@ -295,7 +296,9 @@ type TabStripDecorator(group:WindowGroup) as this =
             let update() = cell.value <- group.bb.read(key, def)
             group.bb.subscribe key update
             cell
-        let autoHideCell = propCell("autoHide", true)
+
+        let isAutoHideEnabledDef = Services.settings.getValue("autoHide").cast<bool>()
+        let autoHideCell = propCell("autoHide", isAutoHideEnabledDef)
         let contextMenuVisibleCell = propCell("contextMenuVisible", false)
         let renamingTabCell = propCell("renamingTab", false)
         let isRecentlyChangedZorderCell =
@@ -347,6 +350,9 @@ type TabStripDecorator(group:WindowGroup) as this =
                 | MouseMiddle ->
                     group.tabActivate(tab, false)
             | _ -> ()
+    
+        member x.tabActivate((tab)) = 
+            group.tabActivate(tab, false)
             
         member x.tabMoved(Tab(hwnd), index) =
             group.onTabMoved(hwnd, index)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ type SettingsRec = {`
`31`	`31`	`groupWindowsInSwitcher: bool`
`32`	`32`	`enableCtrlNumberHotKey: bool`
`33`	`33`	`combineIconsInTaskbar: bool`
	`34`	`+ enableHoverActivate: bool`
	`35`	`+ autoHide: bool`
	`36`	`+ alignment: string`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`type ILicenseManager =`