Align phone header actions right

This commit is contained in:
Joe Julian
2026-04-03 07:18:10 -07:00
parent 4a3e971790
commit c94d039da8
2 changed files with 10 additions and 10 deletions
+4 -9
View File
@@ -603,6 +603,9 @@ func newUIWithState(mode string, sess appstate.CurrentSession, paths statePaths)
backgroundResults: make(chan backgroundActionResult, 8), backgroundResults: make(chan backgroundActionResult, 8),
phoneGroupBrowserExpanded: true, phoneGroupBrowserExpanded: true,
} }
if mode == "phone" {
u.groupControlsHidden = true
}
u.apiPolicyAllow.Value = true u.apiPolicyAllow.Value = true
u.apiPolicyGroupScopeW.Value = true u.apiPolicyGroupScopeW.Value = true
u.state.Session = sess u.state.Session = sess
@@ -625,11 +628,6 @@ func newUIWithState(mode string, sess appstate.CurrentSession, paths statePaths)
u.restoreStartupLifecycleTarget() u.restoreStartupLifecycleTarget()
u.requestMasterPassFocus = u.hasSelectedLifecycleTarget() u.requestMasterPassFocus = u.hasSelectedLifecycleTarget()
u.loadUIPreferences() u.loadUIPreferences()
if u.mode == "phone" {
if _, err := os.Stat(u.uiPreferencesPath); err != nil {
u.groupControlsHidden = true
}
}
u.loadSettings() u.loadSettings()
u.loadSettingsFormFromPreferences() u.loadSettingsFormFromPreferences()
u.loadSettingsDraft() u.loadSettingsDraft()
@@ -3911,10 +3909,7 @@ func (u *ui) header(gtx layout.Context) layout.Dimensions {
} }
return layout.Flex{Axis: layout.Vertical}.Layout(gtx, return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
layout.Rigid(func(gtx layout.Context) layout.Dimensions { layout.Rigid(func(gtx layout.Context) layout.Dimensions {
return layout.Flex{Alignment: layout.Middle}.Layout(gtx, return layout.E.Layout(gtx, u.headerActions)
layout.Flexed(1, func(gtx layout.Context) layout.Dimensions { return layout.Dimensions{} }),
layout.Rigid(u.headerActions),
)
}), }),
layout.Rigid(func(gtx layout.Context) layout.Dimensions { layout.Rigid(func(gtx layout.Context) layout.Dimensions {
if !u.mainMenuOpen { if !u.mainMenuOpen {
+6 -1
View File
@@ -778,7 +778,12 @@ func TestUIPhoneGroupBrowserToggleDoesNotChangeCurrentGroupToolsState(t *testing
func TestUIPhoneStartsWithGroupToolsCollapsed(t *testing.T) { func TestUIPhoneStartsWithGroupToolsCollapsed(t *testing.T) {
t.Parallel() t.Parallel()
u := newUIWithModel("phone", vault.Model{}) u := newUIWithSession("phone", &session.Manager{}, statePaths{
DefaultSaveAsPath: filepath.Join(t.TempDir(), "default-save-path.kdbx"),
RecentVaultsPath: filepath.Join(t.TempDir(), "recent-vaults.json"),
RecentRemotesPath: filepath.Join(t.TempDir(), "recent-remotes.json"),
UIPreferencesPath: filepath.Join(t.TempDir(), "ui-preferences.json"),
})
if !u.groupControlsHidden { if !u.groupControlsHidden {
t.Fatal("groupControlsHidden = false, want phone Group Tools collapsed by default") t.Fatal("groupControlsHidden = false, want phone Group Tools collapsed by default")
} }