Fix the font selector. (#660)

src/components/settings/pages/config/general/index.tsx

@@ -8,7 +8,13 @@ export const BarGeneral = (): JSX.Element => {
         <scrollable name={'General'} className="bar-theme-page paged-container" vscroll={Gtk.PolicyType.AUTOMATIC}>
             <box vertical>
                 <Header title="General Settings" />
-                <Option opt={options.theme.font.name} title="Font" type="font" />
+                <Option
+                    opt={options.theme.font.name}
+                    fontLabel={options.theme.font.label}
+                    fontStyle={options.theme.font.style}
+                    title="Font"
+                    type="font"
+                />
                 <Option opt={options.theme.font.size} title="Font Size" type="string" />
                 <Option
                     opt={options.theme.font.weight}

src/components/settings/shared/Inputter.tsx

@@ -14,6 +14,8 @@ import { Gtk } from 'astal/gtk3';
 
 const InputField = <T extends string | number | boolean | object>({
     opt,
+    fontStyle,
+    fontLabel,
     type = typeof opt.get() as RowProps<T>['type'],
     enums = [],
     disabledBinding,
@@ -44,7 +46,7 @@ const InputField = <T extends string | number | boolean | object>({
         case 'wallpaper':
             return <WallpaperInputter opt={opt} />;
         case 'font':
-            return <FontInputter opt={opt} />;
+            return <FontInputter fontFamily={opt} fontLabel={fontLabel} fontStyle={fontStyle} />;
         case 'color':
             return <ColorInputter opt={opt} />;
 
@@ -55,6 +57,8 @@ const InputField = <T extends string | number | boolean | object>({
 
 export const Inputter = <T extends string | number | boolean | object>({
     opt,
+    fontStyle,
+    fontLabel,
     type = typeof opt.get() as RowProps<T>['type'],
     enums,
     disabledBinding,
@@ -71,6 +75,8 @@ export const Inputter = <T extends string | number | boolean | object>({
             <InputField
                 type={type}
                 opt={opt}
+                fontStyle={fontStyle}
+                fontLabel={fontLabel}
                 enums={enums}
                 disabledBinding={disabledBinding}
                 dependencies={dependencies}

src/components/settings/shared/Option/SettingInput.tsx

@@ -10,6 +10,8 @@ export const SettingInput = <T extends string | number | boolean | object>({
     return (
         <Inputter
             opt={props.opt}
+            fontStyle={props.fontStyle}
+            fontLabel={props.fontLabel}
             type={props.type}
             enums={props.enums}
             disabledBinding={props.disabledBinding}

src/components/settings/shared/inputs/font.tsx

@@ -1,23 +0,0 @@
-import FontButton from 'src/components/shared/FontButton';
-import { Opt } from 'src/lib/option';
-
-export const FontInputter = <T extends string | number | boolean | object>({
-    opt,
-}: FontInputterProps<T>): JSX.Element => {
-    return (
-        <FontButton
-            showSize={false}
-            useSize={false}
-            setup={(self) => {
-                self.font = opt.get() as string;
-
-                self.hook(opt, () => (self.font = opt.get() as string));
-                self.connect('font-set', ({ font }) => opt.set(font!.split(' ').slice(0, -1).join(' ') as T));
-            }}
-        />
-    );
-};
-
-interface FontInputterProps<T> {
-    opt: Opt<T>;
-}

src/components/settings/shared/inputs/font/index.tsx

@@ -0,0 +1,43 @@
+import FontButton from 'src/components/shared/FontButton';
+import { Opt } from 'src/lib/option';
+import { styleToString } from './utils';
+
+export const FontInputter = <T extends string | number | boolean | object>({
+    fontFamily,
+    fontStyle,
+    fontLabel,
+}: FontInputterProps<T>): JSX.Element => (
+    <FontButton
+        showSize={false}
+        useSize={false}
+        setup={(self) => {
+            self.font = fontLabel?.get() ?? (fontFamily.get() as string);
+
+            if (fontLabel) {
+                self.hook(fontLabel, () => {
+                    self.font = fontLabel.get() as string;
+                });
+            } else {
+                self.hook(fontFamily, () => {
+                    self.font = fontFamily.get() as string;
+                });
+            }
+
+            self.connect('font-set', ({ fontDesc, font }) => {
+                const selectedFontFamily = fontDesc.get_family();
+                const selectedFontStyle = styleToString(fontDesc.get_style());
+
+                fontFamily.set(selectedFontFamily as T);
+
+                fontStyle?.set(selectedFontStyle);
+                fontLabel?.set(font.split(' ').slice(0, -1).join(' '));
+            });
+        }}
+    />
+);
+
+interface FontInputterProps<T> {
+    fontFamily: Opt<T>;
+    fontStyle?: Opt<string>;
+    fontLabel?: Opt<string>;
+}

src/components/settings/shared/inputs/font/utils.ts

@@ -0,0 +1,72 @@
+import Pango from 'gi://Pango?version=1.0';
+
+export type FontStyle = 'normal' | 'italic' | 'oblique';
+export type FontVariant = 'normal' | 'small-caps';
+export type FontWeight =
+    | 'thin'
+    | 'ultralight'
+    | 'light'
+    | 'semilight'
+    | 'book'
+    | 'normal'
+    | 'medium'
+    | 'semibold'
+    | 'bold'
+    | 'ultrabold'
+    | 'heavy';
+
+const DEFAULT_FONT_STYLE: FontStyle = 'normal';
+const DEFAULT_FONT_VARIANT: FontVariant = 'normal';
+const DEFAULT_FONT_WEIGHT: FontWeight = 'normal';
+
+const styleMap: Record<Pango.Style, FontStyle> = {
+    [Pango.Style.NORMAL]: 'normal',
+    [Pango.Style.ITALIC]: 'italic',
+    [Pango.Style.OBLIQUE]: 'oblique',
+};
+
+const variantMap: Record<Pango.Variant, FontVariant> = {
+    [Pango.Variant.NORMAL]: 'normal',
+    [Pango.Variant.SMALL_CAPS]: 'small-caps',
+};
+
+const weightMap: Record<Pango.Weight, FontWeight> = {
+    [Pango.Weight.THIN]: 'thin',
+    [Pango.Weight.ULTRALIGHT]: 'ultralight',
+    [Pango.Weight.LIGHT]: 'light',
+    [Pango.Weight.SEMILIGHT]: 'semilight',
+    [Pango.Weight.BOOK]: 'book',
+    [Pango.Weight.NORMAL]: 'normal',
+    [Pango.Weight.MEDIUM]: 'medium',
+    [Pango.Weight.SEMIBOLD]: 'semibold',
+    [Pango.Weight.BOLD]: 'bold',
+    [Pango.Weight.ULTRABOLD]: 'ultrabold',
+    [Pango.Weight.HEAVY]: 'heavy',
+};
+
+/**
+ * Converts a Pango.Style enum to a FontStyle string.
+ * @param styleEnum - The Pango.Style enum value.
+ * @returns The corresponding FontStyle string.
+ */
+export function styleToString(styleEnum: Pango.Style): FontStyle {
+    return styleMap[styleEnum] ?? DEFAULT_FONT_STYLE;
+}
+
+/**
+ * Converts a Pango.Variant enum to a FontVariant string.
+ * @param variantEnum - The Pango.Variant enum value.
+ * @returns The corresponding FontVariant string.
+ */
+export function variantToString(variantEnum: Pango.Variant): FontVariant {
+    return variantMap[variantEnum] ?? DEFAULT_FONT_VARIANT;
+}
+
+/**
+ * Converts a Pango.Weight enum to a FontWeight string.
+ * @param weightEnum - The Pango.Weight enum value.
+ * @returns The corresponding FontWeight string.
+ */
+export function weightToString(weightEnum: Pango.Weight): FontWeight {
+    return weightMap[weightEnum] ?? DEFAULT_FONT_WEIGHT;
+}

src/lib/types/options.d.ts

@@ -104,6 +104,8 @@ export interface RowProps<T> {
     subtitleLink?: string;
     dependencies?: string[];
     increment?: number;
+    fontStyle?: Opt<string>;
+    fontLabel?: Opt<string>;
 }
 
 export type OSDOrientation = 'horizontal' | 'vertical';

src/options.ts

@@ -1,3 +1,4 @@
+import { FontStyle } from './components/settings/shared/inputs/font/utils';
 import { opt, mkOptions } from './lib/option';
 import { NetstatLabelType, RateUnit, ResourceLabelType } from './lib/types/bar';
 import { KbLabelType } from './lib/types/customModules/kbLayout';
@@ -104,6 +105,8 @@ const options = mkOptions(CONFIG, {
         font: {
             size: opt('1.2rem'),
             name: opt('Ubuntu Nerd Font'),
+            style: opt<FontStyle>('normal'),
+            label: opt('Ubuntu Nerd Font'),
             weight: opt(600),
         },
         notification: {

src/scss/main.scss

@@ -1,6 +1,7 @@
 * {
     all: unset;
     font-family: $font-name;
+    font-style: $font-style;
     font-size: $font-size;
     font-weight: $font-weight;
 }

src/scss/style/highlights.scss

@@ -1,222 +1,210 @@
-@import "colors";
+@import 'colors';
 
-* {
-  color: $default_fg;
-  font-family: "JetBrainsMono NF";
-  font-size: 0.9rem;
+html,
+body {
+    padding: 0;
+    margin: 0;
+    background-color: $primary_bg;
 }
 
-html, body {
-  padding: 0;
-  margin: 0;
-  background-color: $primary_bg;
-}
-
-// scrollbar {
-//   background-color: red;
-//   min-width: 5em;
-// }
-
 .code {
-  background: $light-background;
-  border-radius: 0.5rem;
-
-  .code-header {
     background: $light-background;
-    border-top-left-radius: 0.5rem;
-    border-top-right-radius: 0.5rem;
-    border-bottom: 1px solid $primary_fg;
-    padding: 5px;
+    border-radius: 0.5rem;
 
-    > button {
-      color: $default_fg;
-      background: transparent;
-      float: right;
-      border: none;
+    .code-header {
+        background: $light-background;
+        border-top-left-radius: 0.5rem;
+        border-top-right-radius: 0.5rem;
+        border-bottom: 1px solid $primary_fg;
+        padding: 5px;
 
-      &:before {
-        content: '󰆏';
-        display: inline-block;
-        padding-right: 0.5rem;
-      }
+        > button {
+            color: $default_fg;
+            background: transparent;
+            float: right;
+            border: none;
+
+            &:before {
+                content: '󰆏';
+                display: inline-block;
+                padding-right: 0.5rem;
+            }
+        }
     }
-  }
 }
 
 $languages-map: (
-  arduino: "",
-  armasm: "",
-  avrasm: "",
-  bash: "",
-  c: "",
-  clojure: "",
-  coffeescript: "",
-  cpp: "",
-  csharp: "󰌛",
-  css: "",
-  dockerfile: "󰡨",
-  go: "",
-  gradle: "",
-  haskell: "",
-  html: "",
-  java: "",
-  javascript: "󰌞",
-  json: "",
-  latex: "",
-  lua: "󰢱",
-  makefile: "",
-  markdown: "",
-  mipsasm: "",
-  nginx: "",
-  nix: "󱄅",
-  php: "",
-  prolog: "",
-  python: "",
-  r: "󰟔",
-  ruby: "",
-  rust: "",
-  scss: "",
-  shell: "",
-  typescript: "󰛦",
-  wasm: "",
-  x86asm: "",
-  xml: "󰗀",
+    arduino: '',
+    armasm: '',
+    avrasm: '',
+    bash: '',
+    c: '',
+    clojure: '',
+    coffeescript: '',
+    cpp: '',
+    csharp: '󰌛',
+    css: '',
+    dockerfile: '󰡨',
+    go: '',
+    gradle: '',
+    haskell: '',
+    html: '',
+    java: '',
+    javascript: '󰌞',
+    json: '',
+    latex: '',
+    lua: '󰢱',
+    makefile: '',
+    markdown: '',
+    mipsasm: '',
+    nginx: '',
+    nix: '󱄅',
+    php: '',
+    prolog: '',
+    python: '',
+    r: '󰟔',
+    ruby: '',
+    rust: '',
+    scss: '',
+    shell: '',
+    typescript: '󰛦',
+    wasm: '',
+    x86asm: '',
+    xml: '󰗀',
 );
 
 @each $lang, $content in $languages-map {
-  [data-language="#{$lang}"]:before {
-    content: $content;
-    font-size: 1.1rem;
-    color: $primary_fg;
-    padding-right: 0.5rem;
-  }
+    [data-language='#{$lang}']:before {
+        content: $content;
+        font-size: 1.1rem;
+        color: $primary_fg;
+        padding-right: 0.5rem;
+    }
 }
 
 pre {
-  padding: 5px;
-  overflow-x: scroll;
+    padding: 5px;
+    overflow-x: scroll;
 
-  code.hljs {
-    color: $default_fg;
-    background: transparent;
-  }
+    code.hljs {
+        color: $default_fg;
+        background: transparent;
+    }
 }
 
 code {
-  & .hljs-keyword {
-    color: $mauve;
-  }
+    & .hljs-keyword {
+        color: $mauve;
+    }
 
-  & .hljs-built_in {
-    color: $red;
-  }
+    & .hljs-built_in {
+        color: $red;
+    }
 
-  & .hljs-type {
-    color: $yellow;
-  }
+    & .hljs-type {
+        color: $yellow;
+    }
 
-  & .hljs-literal,
-  & .hljs-number {
-    color: $orange;
-  }
+    & .hljs-literal,
+    & .hljs-number {
+        color: $orange;
+    }
 
-  & .hljs-operator {
-    color: $teal;
-  }
+    & .hljs-operator {
+        color: $teal;
+    }
 
-  & .hljs-punctuation {
-    color: $lightteal;
-  }
+    & .hljs-punctuation {
+        color: $lightteal;
+    }
 
-  & .hljs-property,
-  & .hljs-variable.language_,
-  & .hljs-symbol {
-    color: $teal;
-  }
+    & .hljs-property,
+    & .hljs-variable.language_,
+    & .hljs-symbol {
+        color: $teal;
+    }
 
-  & .hljs-regexp {
-    color: $pink;
-  }
+    & .hljs-regexp {
+        color: $pink;
+    }
 
-  & .hljs-string,
-  & .hljs-char.escape_,
-  & .hljs-subst {
-    color: $green;
-  }
+    & .hljs-string,
+    & .hljs-char.escape_,
+    & .hljs-subst {
+        color: $green;
+    }
 
-  & .hljs-comment {
-    color: $grey;
-  }
+    & .hljs-comment {
+        color: $grey;
+    }
 
-  & .hljs-doctag {
-    color: $red;
-  }
+    & .hljs-doctag {
+        color: $red;
+    }
 
-  & .hljs-meta,
-  & .hljs-title.function_,
-  & .hljs-section {
-    color: $orange;
-  }
+    & .hljs-meta,
+    & .hljs-title.function_,
+    & .hljs-section {
+        color: $orange;
+    }
 
-  & .hljs-tag,
-  & .hljs-attribute {
-    color: $lightgrey;
-  }
+    & .hljs-tag,
+    & .hljs-attribute {
+        color: $lightgrey;
+    }
 
-  & .hljs-name,
-  & .hljs-selector-attr {
-    color: $mauve;
-  }
+    & .hljs-name,
+    & .hljs-selector-attr {
+        color: $mauve;
+    }
 
-  & .hljs-params,
-  & .hljs-selector-class,
-  & .hljs-template-variable {
-    color: $default_fg;
-  }
+    & .hljs-params,
+    & .hljs-selector-class,
+    & .hljs-template-variable {
+        color: $default_fg;
+    }
 
-  & .hljs-selector-tag {
-    color: $yellow;
-  }
+    & .hljs-selector-tag {
+        color: $yellow;
+    }
 
-  & .hljs-selector-id {
-    color: $blue;
-  }
+    & .hljs-selector-id {
+        color: $blue;
+    }
 
-  & .hljs-bullet,
-  & .hljs-code,
-  & .hljs-formula {
-    color: $teal;
-  }
+    & .hljs-bullet,
+    & .hljs-code,
+    & .hljs-formula {
+        color: $teal;
+    }
 
-  & .hljs-emphasis {
-    color: $red;
-    font-style: italic;
-  }
+    & .hljs-emphasis {
+        color: $red;
+        font-style: italic;
+    }
 
-  & .hljs-strong {
-    color: $red;
-    font-weight: bold;
-  }
+    & .hljs-strong {
+        color: $red;
+        font-weight: bold;
+    }
 
-  & .hljs-link {
-    color: $lightblue;
-    font-style: italic;
-  }
+    & .hljs-link {
+        color: $lightblue;
+        font-style: italic;
+    }
 
-  & .hljs-quote {
-    color: $green;
-    font-style: italic;
-  }
+    & .hljs-quote {
+        color: $green;
+        font-style: italic;
+    }
 
-  & .hljs-addition {
-    color: $green;
-    background: rgba(166, 227, 161, 0.15);
-  }
+    & .hljs-addition {
+        color: $green;
+        background: rgba(166, 227, 161, 0.15);
+    }
 
-  & .hljs-deletion {
-    color: $red;
-    background: rgba(243, 139, 168, 0.15);
-  }
+    & .hljs-deletion {
+        color: $red;
+        background: rgba(243, 139, 168, 0.15);
+    }
 }
-
-

src/scss/utils/hotReload.ts

@@ -3,6 +3,7 @@ import { resetCss } from '../style';
 
 export const initializeHotReload = async (): Promise<void> => {
     const monitorList = [
+        `${SRC_DIR}/src/scss/main.scss`,
         `${SRC_DIR}/src/scss/style/bar`,
         `${SRC_DIR}/src/scss/style/common`,
         `${SRC_DIR}/src/scss/style/menus`,