Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Manage size-immutable #43

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Manage size-immutable #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df5ac02
[add] Manage `size-immutable`
5ouma Sep 8, 2023
7a56468
Merge branch 'master' into 5ouma-size-immutable
5ouma Sep 17, 2023
6838c28
Merge branch 'blacktop:master' into 5ouma-size-immutable
5ouma Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/command/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ func SaveConfig(c *Config) (err error) {
MinimizeToApplication: dPlist.MinimizeToApplication,
MruSpaces: dPlist.MruSpaces,
ShowRecents: dPlist.ShowRecents,
SizeImmutable: dPlist.SizeImmutable,
TileSize: dPlist.TileSize,
}

Expand Down
1 change: 1 addition & 0 deletions internal/database/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ type DockSettings struct {
MinimizeToApplication bool `yaml:"minimize-to-application" json:"minimize-to-application,omitempty"`
MruSpaces bool `yaml:"mru-spaces" json:"mru-spaces,omitempty"`
ShowRecents bool `yaml:"show-recents" json:"show-recents,omitempty"`
SizeImmutable bool `yaml:"size-immutable" json:"size-immutable,omitempty"`
TileSize any `yaml:"tilesize" json:"tilesize,omitempty"`
}

Expand Down
2 changes: 2 additions & 0 deletions internal/dock/dock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ type Plist struct {
Region string `plist:"region"`
ShowRecents bool `plist:"show-recents"`
ShowAppExposeGestureEnabled bool `plist:"showAppExposeGestureEnabled"`
SizeImmutable bool `plist:"size-immutable"`
TileSize any `plist:"tilesize,omitempty"`
TrashFull bool `plist:"trash-full"`
Version int `plist:"version"`
Expand Down Expand Up @@ -226,6 +227,7 @@ func (p *Plist) ApplySettings(setting database.DockSettings) error {
p.MinimizeToApplication = setting.MinimizeToApplication
p.MruSpaces = setting.MruSpaces
p.ShowRecents = setting.ShowRecents
p.SizeImmutable = setting.SizeImmutable
switch v := setting.LargeSize.(type) {
case float64:
if v < 16 && v > 128 {
Expand Down