diff --git a/.config/ags/modules/.miscutils/hyprlanddata.js b/.config/ags/modules/.commondata/hyprlanddata.js similarity index 56% rename from .config/ags/modules/.miscutils/hyprlanddata.js rename to .config/ags/modules/.commondata/hyprlanddata.js index b67a5458..665909ab 100644 --- a/.config/ags/modules/.miscutils/hyprlanddata.js +++ b/.config/ags/modules/.commondata/hyprlanddata.js @@ -10,9 +10,14 @@ async function updateStuff() { const display = Gdk.Display.get_default(); monitors.forEach((monitor, i) => { const gdkMonitor = display.get_monitor(i); - monitor.width = gdkMonitor.get_geometry().width; - monitor.height = gdkMonitor.get_geometry().height; + monitor.realWidth = monitor.width; + monitor.realHeight = monitor.height; + // monitor.width = gdkMonitor.get_geometry().width; + // monitor.height = gdkMonitor.get_geometry().height; + monitor.width = Math.ceil(monitor.realWidth / monitor.scale); + monitor.height = Math.ceil(monitor.realHeight / monitor.scale); }); + console.log(monitors) } updateStuff().catch(print); diff --git a/.config/ags/modules/.commonwidgets/clickcloseregion.js b/.config/ags/modules/.commonwidgets/clickcloseregion.js index 2af13ca4..e0aae79b 100644 --- a/.config/ags/modules/.commonwidgets/clickcloseregion.js +++ b/.config/ags/modules/.commonwidgets/clickcloseregion.js @@ -1,6 +1,6 @@ import App from 'resource:///com/github/Aylur/ags/app.js'; import Widget from 'resource:///com/github/Aylur/ags/widget.js'; -import { monitors } from '../.miscutils/hyprlanddata.js'; +import { monitors } from '../.commondata/hyprlanddata.js'; const { Box, EventBox } = Widget; export const clickCloseRegion = ({ name, multimonitor = true, monitor = 0, expand = true, fillMonitor = '' }) => { diff --git a/.config/ags/modules/desktopbackground/wallpaper.js b/.config/ags/modules/desktopbackground/wallpaper.js index 599a7526..779bb230 100644 --- a/.config/ags/modules/desktopbackground/wallpaper.js +++ b/.config/ags/modules/desktopbackground/wallpaper.js @@ -8,7 +8,7 @@ import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js'; import Wallpaper from '../../services/wallpaper.js'; import { setupCursorHover } from '../.widgetutils/cursorhover.js'; import { clamp } from '../.miscutils/mathfuncs.js'; -import { monitors } from '../.miscutils/hyprlanddata.js'; +import { monitors } from '../.commondata/hyprlanddata.js'; const DISABLE_AGS_WALLPAPER = true; diff --git a/.config/ags/modules/overview/overview_hyprland.js b/.config/ags/modules/overview/overview_hyprland.js index 5250ef61..9b5b7548 100644 --- a/.config/ags/modules/overview/overview_hyprland.js +++ b/.config/ags/modules/overview/overview_hyprland.js @@ -14,7 +14,7 @@ const { execAsync, exec } = Utils; import { setupCursorHoverGrab } from '../.widgetutils/cursorhover.js'; import { dumpToWorkspace, swapWorkspace } from "./actions.js"; import { iconExists, substitute } from "../.miscutils/icons.js"; -import { monitors } from '../.miscutils/hyprlanddata.js'; +import { monitors } from '../.commondata/hyprlanddata.js'; import { MaterialIcon } from '../.commonwidgets/materialicon.js'; const NUM_OF_WORKSPACES_SHOWN = userOptions.overview.numOfCols * userOptions.overview.numOfRows; diff --git a/.config/ags/modules/session/sessionscreen.js b/.config/ags/modules/session/sessionscreen.js index 090d0950..1160047f 100644 --- a/.config/ags/modules/session/sessionscreen.js +++ b/.config/ags/modules/session/sessionscreen.js @@ -4,7 +4,7 @@ const { Gdk, Gtk } = imports.gi; import App from 'resource:///com/github/Aylur/ags/app.js'; import Widget from 'resource:///com/github/Aylur/ags/widget.js'; import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'; -import { monitors } from '../.miscutils/hyprlanddata.js'; +import { monitors } from '../.commondata/hyprlanddata.js'; const { exec, execAsync } = Utils;