Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnnovak
johnnovak committed Jul 3, 2024
1 parent 24ee28c commit e866fed
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 28 deletions.
9 changes: 9 additions & 0 deletions src/common.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,26 +385,32 @@ type
borderColor*: Color
backgroundColor*: Color
backgroundImage*: string

titleBackgroundColor*: Color
titleBackgroundInactiveColor*: Color
titleColor*: Color
titleInactiveColor*: Color

buttonColor*: Color
buttonHoverColor*: Color
buttonDownColor*: Color
buttonInactiveColor*: Color

modifiedFlagColor*: Color
modifiedFlagInactiveColor*: Color


StatusBarTheme* = ref object
backgroundColor*: Color
textColor*: Color
warningTextColor*: Color
errorTextColor*: Color
coordinatesColor*: Color

commandBackgroundColor*: Color
commandTextColor*: Color


CurrentNotePaneTheme* = ref object
textColor*: Color
indexColor*: Color
Expand All @@ -425,12 +431,15 @@ type
trailNormalColor*: Color
trailCursorColor*: Color
pastePreviewColor*: Color

foregroundNormalNormalColor*: Color
foregroundNormalCursorColor*: Color
foregroundLightNormalColor*: Color
foregroundLightCursorColor*: Color

coordinatesNormalColor*: Color
coordinatesHighlightColor*: Color

regionBorderNormalColor*: Color
regionBorderEmptyColor*: Color

Expand Down
3 changes: 2 additions & 1 deletion src/main.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7138,7 +7138,7 @@ proc handleGlobalKeyEvents(a) =

elif ke.isShortcutDown(scToggleTitleBar, a):
toggleTitleBar(a)

# Save/restore layout
elif ke.isShortcutDown(scSaveLayout1, a): saveLayout(0, a)
elif ke.isShortcutDown(scSaveLayout2, a): saveLayout(1, a)
Expand Down Expand Up @@ -9132,6 +9132,7 @@ proc renderThemeEditorProps(x, y, w, h: float; a) =
group:
colorProp("Marker Normal", p & "marker.normal")
colorProp("Marker Cursor", p & "marker.cursor")
group:
colorProp("Comment", p & "comment")
group:
enumProp( "Background Shape", p & "background-shape",
Expand Down
63 changes: 36 additions & 27 deletions src/theme.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,26 @@ proc toLevelTheme*(cfg: HoconNode): LevelTheme =
s = new LevelTheme

var p = "general."
s.lineWidth = cfg.getEnumOrDefault(p & "line-width", LineWidth)
s.backgroundColor = cfg.getColorOrDefault(p & "background")
s.cursorColor = cfg.getColorOrDefault(p & "cursor")
s.cursorGuidesColor = cfg.getColorOrDefault(p & "cursor-guides")
s.linkMarkerColor = cfg.getColorOrDefault(p & "link-marker")
s.selectionColor = cfg.getColorOrDefault(p & "selection")
s.trailNormalColor = cfg.getColorOrDefault(p & "trail.normal")
s.trailCursorColor = cfg.getColorOrDefault(p & "trail.cursor")
s.pastePreviewColor = cfg.getColorOrDefault(p & "paste-preview")
s.lineWidth = cfg.getEnumOrDefault(p & "line-width", LineWidth)
s.backgroundColor = cfg.getColorOrDefault(p & "background")
s.cursorColor = cfg.getColorOrDefault(p & "cursor")
s.cursorGuidesColor = cfg.getColorOrDefault(p & "cursor-guides")
s.linkMarkerColor = cfg.getColorOrDefault(p & "link-marker")
s.selectionColor = cfg.getColorOrDefault(p & "selection")
s.trailNormalColor = cfg.getColorOrDefault(p & "trail.normal")
s.trailCursorColor = cfg.getColorOrDefault(p & "trail.cursor")
s.pastePreviewColor = cfg.getColorOrDefault(p & "paste-preview")

s.foregroundNormalNormalColor = cfg.getColorOrDefault(p & "foreground.normal.normal")
s.foregroundNormalCursorColor = cfg.getColorOrDefault(p & "foreground.normal.cursor")
s.foregroundLightNormalColor = cfg.getColorOrDefault(p & "foreground.light.normal")
s.foregroundLightCursorColor = cfg.getColorOrDefault(p & "foreground.light.cursor")
s.coordinatesNormalColor = cfg.getColorOrDefault(p & "coordinates.normal")
s.coordinatesHighlightColor = cfg.getColorOrDefault(p & "coordinates.highlight")
s.regionBorderNormalColor = cfg.getColorOrDefault(p & "region-border.normal")
s.regionBorderEmptyColor = cfg.getColorOrDefault(p & "region-border.empty")

s.coordinatesNormalColor = cfg.getColorOrDefault(p & "coordinates.normal")
s.coordinatesHighlightColor = cfg.getColorOrDefault(p & "coordinates.highlight")

s.regionBorderNormalColor = cfg.getColorOrDefault(p & "region-border.normal")
s.regionBorderEmptyColor = cfg.getColorOrDefault(p & "region-border.empty")

p = "background-hatch."
s.backgroundHatchEnabled = cfg.getBoolOrDefault(p & "enabled")
Expand Down Expand Up @@ -140,31 +143,36 @@ proc toWindowTheme*(cfg: HoconNode): WindowTheme =
alias(s, result)
s = new WindowTheme

s.borderColor = cfg.getColorOrDefault("border.color")
s.backgroundColor = cfg.getColorOrDefault("background.color")
s.backgroundImage = cfg.getStringOrDefault("background.image")
s.borderColor = cfg.getColorOrDefault("border.color")

s.backgroundColor = cfg.getColorOrDefault("background.color")
s.backgroundImage = cfg.getStringOrDefault("background.image")

s.titleBackgroundColor = cfg.getColorOrDefault("title.background.normal")
s.titleBackgroundInactiveColor = cfg.getColorOrDefault("title.background.inactive")
s.titleColor = cfg.getColorOrDefault("title.text.normal")
s.titleInactiveColor = cfg.getColorOrDefault("title.text.inactive")
s.modifiedFlagColor = cfg.getColorOrDefault("modified-flag.normal")
s.modifiedFlagInactiveColor = cfg.getColorOrDefault("modified-flag.inactive")
s.buttonColor = cfg.getColorOrDefault("button.normal")
s.buttonHoverColor = cfg.getColorOrDefault("button.hover")
s.buttonDownColor = cfg.getColorOrDefault("button.down")
s.buttonInactiveColor = cfg.getColorOrDefault("button.inactive")

s.modifiedFlagColor = cfg.getColorOrDefault("modified-flag.normal")
s.modifiedFlagInactiveColor = cfg.getColorOrDefault("modified-flag.inactive")

s.buttonColor = cfg.getColorOrDefault("button.normal")
s.buttonHoverColor = cfg.getColorOrDefault("button.hover")
s.buttonDownColor = cfg.getColorOrDefault("button.down")
s.buttonInactiveColor = cfg.getColorOrDefault("button.inactive")

# }}}
# {{{ toStatusBarTheme*()
proc toStatusBarTheme*(cfg: HoconNode): StatusBarTheme =
alias(s, result)
s = new StatusBarTheme

s.backgroundColor = cfg.getColorOrDefault("background")
s.textColor = cfg.getColorOrDefault("text")
s.warningTextColor = cfg.getColorOrDefault("warning")
s.errorTextColor = cfg.getColorOrDefault("error")
s.coordinatesColor = cfg.getColorOrDefault("coordinates")
s.backgroundColor = cfg.getColorOrDefault("background")
s.textColor = cfg.getColorOrDefault("text")
s.warningTextColor = cfg.getColorOrDefault("warning")
s.errorTextColor = cfg.getColorOrDefault("error")
s.coordinatesColor = cfg.getColorOrDefault("coordinates")

s.commandBackgroundColor = cfg.getColorOrDefault("command.background")
s.commandTextColor = cfg.getColorOrDefault("command.text")

Expand All @@ -187,6 +195,7 @@ proc toToolbarPaneTheme*(cfg: HoconNode): ToolbarPaneTheme =

s.buttonNormalColor = cfg.getColorOrDefault("button.normal")
s.buttonHoverColor = cfg.getColorOrDefault("button.hover")

# }}}

# {{{ loadTheme*()
Expand Down

0 comments on commit e866fed

Please sign in to comment.