devices/wim/config/ags/js/corners/screen-corners.js

@@ -2,10 +2,7 @@ import { Box, DrawingArea } from 'resource:///com/github/Aylur/ags/widget.js';
 import Gtk from 'gi://Gtk';
 const Lang = imports.lang;
 
-export default (
+export default place => Box({
-    place,
-    css = 'background-color: black;',
-) => Box({
     hpack: place.includes('left') ? 'start' : 'end',
     vpack: place.includes('top')  ? 'start' : 'end',
     css: `
@@ -17,9 +14,10 @@ export default (
         `,
     child: DrawingArea({
         css: `
+            background-color: black;
             border-radius: 18px;
             border-width: 0.068rem;
-        ` + css,
+        `,
         setup: widget => {
             const r = widget.get_style_context()
                 .get_property('border-radius', Gtk.StateFlags.NORMAL);

devices/wim/config/ags/js/misc/separator.js

@@ -1,16 +1,16 @@
 import { Box } from 'resource:///com/github/Aylur/ags/widget.js';
 
 
-export default (size, { vertical = false, css = '', ...props } = {}) => {
+export default (size, { vertical = false, ...props } = {}) => {
     if (vertical) {
         return Box({
-            css: `min-height: ${size}px; ${css}`,
+            css: `min-height: ${size}px;`,
             ...props,
         });
     }
     else {
         return Box({
-            css: `min-width: ${size}px; ${css}`,
+            css: `min-width: ${size}px;`,
             ...props,
         });
     }

devices/wim/config/ags/js/on-screen-keyboard/gesture.js

@@ -1,46 +1,10 @@
-import { execAsync, timeout } from 'resource:///com/github/Aylur/ags/utils.js';
-
 import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js';
-
 import Gtk from 'gi://Gtk';
 
 
-const releaseAllKeys = () => {
-    const keycodes = Array.from(Array(249).keys());
-    execAsync([
-        'ydotool', 'key',
-        ...keycodes.map(keycode => `${keycode}:0`),
-    ]).catch(print);
-};
-
-const hidden = 340;
 export default window => {
-    window.child.setCss(`margin-bottom: -${hidden}px;`);
     const gesture = Gtk.GestureDrag.new(window);
 
-    window.setVisible = state => {
-        if (state) {
-            window.visible = true;
-            window.setSlideDown();
-            window.child.setCss(`
-                transition: margin-bottom 0.7s cubic-bezier(0.36, 0, 0.66, -0.56);
-                margin-bottom: 0px;
-            `);
-        }
-        else {
-            timeout(710, () => {
-                if (!Tablet.tabletMode)
-                    window.visible = false;
-            });
-            releaseAllKeys();
-            window.setSlideUp();
-            window.child.setCss(`
-                transition: margin-bottom 0.7s cubic-bezier(0.36, 0, 0.66, -0.56);
-                margin-bottom: -${hidden}px;
-            `);
-        }
-    };
-
     gesture.signals = [];
     window.killGestureSigs = () => {
         gesture.signals.forEach(id => gesture.disconnect(id));
@@ -48,6 +12,8 @@ export default window => {
     };
 
     window.setSlideUp = () => {
+        console.log(window.get_allocated_height());
+
         window.killGestureSigs();
 
         // Begin drag
@@ -70,7 +36,7 @@ export default window => {
                         return;
 
                     window.child.setCss(`
-                        margin-bottom: ${offset - hidden}px;
+                        margin-bottom: ${offset}px;
                     `);
                 });
             }),
@@ -81,7 +47,7 @@ export default window => {
             gesture.connect('drag-end', () => {
                 window.child.setCss(`
                     transition: margin-bottom 0.5s ease-in-out;
-                    margin-bottom: -${hidden}px;
+                    margin-bottom: 0px;
                 `);
             }),
         );
@@ -127,5 +93,7 @@ export default window => {
         );
     };
 
+    window.setSlideDown();
+
     return window;
 };

devices/wim/config/ags/js/on-screen-keyboard/keyboard.js

@@ -1,7 +1,6 @@
 import { Box, CenterBox, Label, ToggleButton } from 'resource:///com/github/Aylur/ags/widget.js';
-
 import Separator from '../misc/separator.js';
-import RoundedCorner from '../corners/screen-corners.js';
+
 import Key from './keys.js';
 
 import { defaultOskLayout, oskLayouts } from './keyboard-layouts.js';
@@ -11,26 +10,7 @@ const keyboardJson = oskLayouts[keyboardLayout];
 const L_KEY_PER_ROW = [8, 7, 6, 6, 6, 4];
 
 
-const color = 'rgba(0, 0, 0, 0.3)';
+export default window => CenterBox({
-export default window => Box({
-    vertical: true,
-    children: [
-        CenterBox({
-            hpack: 'center',
-            start_widget: RoundedCorner('bottomright', `
-                background-color: ${color};
-            `),
-            center_widget: Box({
-                class_name: 'thingy',
-                css: `background: ${color};`,
-            }),
-            end_widget: RoundedCorner('bottomleft', `
-                background-color: ${color};
-            `),
-        }),
-
-        CenterBox({
-            css: `background: ${color};`,
     class_name: 'osk',
     hexpand: true,
     start_widget: Box({
@@ -42,12 +22,9 @@ export default window => Box({
             children: [
                 Box({
                     class_name: 'row',
-                            children: [
+                    children: row.map((key, keyIndex) => {
-                                Separator(4),
-                                ...row.map((key, keyIndex) => {
                         return keyIndex < L_KEY_PER_ROW[rowIndex] ? Key(key) : null;
                     }),
-                            ],
                 }),
                 Separator(4, { vertical: true }),
             ],
@@ -95,6 +72,4 @@ export default window => Box({
             ],
         })),
     }),
-        }),
-    ],
 });

devices/wim/config/ags/js/on-screen-keyboard/main.js

@@ -1,31 +1,33 @@
-import { Window } from 'resource:///com/github/Aylur/ags/widget.js';
 import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js';
 
 import Gesture from './gesture.js';
 import Keyboard from './keyboard.js';
+import PopupWindow from '../misc/popup.js';
 
 
-// start ydotool daemon
+// ydotool stuff
 execAsync('ydotoold').catch(print);
 
+function releaseAllKeys() {
+    const keycodes = Array.from(Array(249).keys());
+    execAsync([
+        'ydotool', 'key',
+        ...keycodes.map(keycode => `${keycode}:0`),
+    ]).catch(print);
+}
+
 // Window
 export default () => {
-    const window = Window({
+    const window = PopupWindow({
         name: 'osk',
-        visible: false,
         anchor: ['left', 'bottom', 'right'],
-        connections: [
+        onClose: releaseAllKeys,
-            [Tablet, (self, state) => {
+        closeOnUnfocus: 'none',
-                self.setVisible(state);
+        connections: [[Tablet, self => {
-            }, 'osk-toggled'],
+            self.visible = Tablet.oskState;
-
+        }, 'osk-toggled']],
-            [Tablet, () => {
-                if (!Tablet.tabletMode && !Tablet.oskState)
-                    window.visible = false;
-            }, 'mode-toggled'],
-        ],
     });
-    window.child = Keyboard(window);
+    window.setChild(Keyboard(window));
 
     return Gesture(window);
 };

devices/wim/config/ags/scss/widgets/osk.scss

@@ -1,12 +1,5 @@
-.thingy {
-  border-radius: 2rem 2rem 0 0;
-  min-height: 2.7rem;
-  min-width: 20rem;
-}
-
 .osk {
-  padding-top: 4px;
+  margin-left: 4px;
-  border-radius: 10px 10px 0;
 
   .settings {
     background-color: $bg;