diff --git a/.config/ags/config.js b/.config/ags/config.js index c738a39f9..3c6f9c185 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -52,13 +52,6 @@ export default { SideRight(), Osk(), // On-screen keyboard Session(), // Power menu, if that's what you like to call it + Bar() ], }; - -// We don't want context menus of the bar's tray go under the rounded corner below, -// so bar is returned after default export, making it get spawned after the corner -// (having an Utils.timeout in that window array just gives an error) -// Not having it in default export is fine since we don't need to toggle it -Bar(); - -// uwu \ No newline at end of file diff --git a/.config/ags/data/keyboardlayouts.js b/.config/ags/data/keyboardlayouts.js index f58e378a4..26cb23d63 100644 --- a/.config/ags/data/keyboardlayouts.js +++ b/.config/ags/data/keyboardlayouts.js @@ -111,4 +111,4 @@ export const oskLayouts = { ] ] } -} \ No newline at end of file +} diff --git a/.config/ags/scss/main.scss b/.config/ags/scss/main.scss index 45b200385..034f91bff 100644 --- a/.config/ags/scss/main.scss +++ b/.config/ags/scss/main.scss @@ -35,5 +35,6 @@ .sidebar-pinned { margin: 0rem; border-radius: 0rem; - border: 0rem solid transparent; + border-bottom-right-radius: $rounding_large; + border: 0rem solid; } \ No newline at end of file diff --git a/.config/ags/style.css b/.config/ags/style.css index cbded551c..3e3588415 100644 --- a/.config/ags/style.css +++ b/.config/ags/style.css @@ -54,47 +54,47 @@ margin: 10px; } .txt-badonkers { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 3rem; } .txt-tiddies { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 2.7273rem; } .txt-hugerass { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 2.045rem; } .txt-hugeass { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 1.8182rem; } .txt-larger { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 1.6363rem; } .txt-large { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 1.4545rem; } .txt-norm { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 1.2727rem; } .txt-small { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 1.0909rem; } .txt-smallie { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 1rem; } .txt-smaller { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 0.9091rem; } .txt-tiny { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 0.7273rem; } .txt-poof { @@ -119,7 +119,7 @@ font-family: 'Gabarito', 'Poppins', 'Lexend', sans-serif; } .mainfont { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; } + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; } .icon-material { font-family: 'Material Symbols Rounded', 'Material Symbols Outlined', 'Material Symbols Sharp'; } @@ -587,7 +587,7 @@ tooltip { min-height: 1.636rem; min-width: 1.772rem; font-size: 1.091rem; - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; border-top: 0.068rem solid; border-bottom: 0.068rem solid; border-color: transparent; @@ -600,7 +600,7 @@ tooltip { min-height: 1.5rem; min-width: 1.5rem; font-size: 1.091rem; - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; background-color: #d6baff; color: #3d1c70; border-radius: 999px; @@ -953,11 +953,11 @@ tooltip { border: 0.682rem solid; } .bg-quicklaunch-title { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; color: #cbc4cf; } .bg-quicklaunch-btn { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; border-radius: 9999px; -gtk-outline-radius: 9999px; background-color: #28262b; @@ -1230,7 +1230,7 @@ tooltip { background-color: rgba(51, 48, 52, 0.1147); } .overview-tasks-workspace-number { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; color: rgba(217, 211, 216, 0.31); } .overview-tasks-window { @@ -1852,7 +1852,7 @@ tooltip { border: 0.068rem solid rgba(234, 222, 247, 0.07); } .sidebar-chat-codeblock-topbar { - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; margin: 0.273rem; margin-bottom: 0rem; background-color: #4b4358; @@ -2174,7 +2174,7 @@ tooltip { .osd-music-artists { transition: 300ms cubic-bezier(0.1, 1, 0, 1); - font-family: 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; + font-family: 'Rubik', 'Geist', 'AR One Sans', 'Reddit Sans', 'Inter', 'Roboto', 'Ubuntu', 'Noto Sans', sans-serif; font-size: 0.955rem; color: rgba(202, 196, 203, 0.9); } @@ -2249,4 +2249,5 @@ tooltip { .sidebar-pinned { margin: 0rem; border-radius: 0rem; - border: 0rem solid transparent; } + border-bottom-right-radius: 1.705rem; + border: 0rem solid; } diff --git a/.config/ags/widgets/screencorners/main.js b/.config/ags/widgets/screencorners/main.js index f2f412d6f..1c6c61b38 100644 --- a/.config/ags/widgets/screencorners/main.js +++ b/.config/ags/widgets/screencorners/main.js @@ -21,7 +21,7 @@ export const CornerBottomleft = () => Widget.Window({ name: 'cornerbl', layer: 'top', anchor: ['bottom', 'left'], - exclusivity: 'normal', + exclusivity: 'ignore', visible: true, child: RoundedCorner('bottomleft', { className: 'corner-black', }), }); @@ -29,7 +29,7 @@ export const CornerBottomright = () => Widget.Window({ name: 'cornerbr', layer: 'top', anchor: ['bottom', 'right'], - exclusivity: 'normal', + exclusivity: 'ignore', visible: true, child: RoundedCorner('bottomright', { className: 'corner-black', }), }); diff --git a/.config/ags/widgets/sideleft/sideleft.js b/.config/ags/widgets/sideleft/sideleft.js index 4c9a18ac4..9d9954511 100644 --- a/.config/ags/widgets/sideleft/sideleft.js +++ b/.config/ags/widgets/sideleft/sideleft.js @@ -57,7 +57,7 @@ const contentStack = Stack({ const navIndicator = NavigationIndicator(2, false, { // The line thing className: 'sidebar-selector-highlight', - css: 'font-size: 0px; padding: 0rem 4.773rem;', // Shushhhh + css: 'font-size: 0px; padding: 0rem 4.160rem;', // Shushhhh }) const navBar = Box({ @@ -88,11 +88,23 @@ const pinButton = Button({ self.toggleClassName('sidebar-pin-enabled', self._enabled); const sideleftWindow = App.getWindow('sideleft'); + const barWindow = App.getWindow('bar'); + const cornerTopLeftWindow = App.getWindow('cornertl'); const sideleftContent = sideleftWindow.get_children()[0].get_children()[0].get_children()[1]; - // console.log(sideleftWindow.exclusivity); + sideleftWindow.exclusivity = (self._enabled ? 'exclusive' : 'normal'); - sideleftWindow.layer = (self._enabled ? 'bottom' : 'top'); sideleftContent.toggleClassName('sidebar-pinned', self._enabled); + + if(self._enabled) { + sideleftWindow.layer = 'bottom'; + barWindow.layer = 'bottom'; + cornerTopLeftWindow.layer = 'bottom'; + } + else { + sideleftWindow.layer = 'top'; + barWindow.layer = 'top'; + cornerTopLeftWindow.layer = 'top'; + } }, // QoL: Focus Pin button on open. Hit keybind -> space/enter = toggle pin state connections: [[App, (self, currentName, visible) => {