diff -Nru plank-0.11.89+git20231215.b5329fd4/.tarball-version plank-0.11.89+git20231220.7d76a21a/.tarball-version --- plank-0.11.89+git20231215.b5329fd4/.tarball-version 2023-12-15 14:10:59.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/.tarball-version 2023-12-20 13:41:07.000000000 +0000 @@ -1 +1 @@ -0.11.89.18-b532 +0.11.89.19-7d76 diff -Nru plank-0.11.89+git20231215.b5329fd4/.version plank-0.11.89+git20231220.7d76a21a/.version --- plank-0.11.89+git20231215.b5329fd4/.version 2023-12-15 14:10:37.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/.version 2023-12-20 13:40:44.000000000 +0000 @@ -1 +1 @@ -0.11.89.18-b532 +0.11.89.19-7d76 diff -Nru plank-0.11.89+git20231215.b5329fd4/ChangeLog plank-0.11.89+git20231220.7d76a21a/ChangeLog --- plank-0.11.89+git20231215.b5329fd4/ChangeLog 2023-12-15 14:10:56.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/ChangeLog 2023-12-20 13:41:04.000000000 +0000 @@ -1,3 +1,10 @@ +2023-12-20 Rico Tzschichholz + + Use Screen.get_monitor_workarea() to position dock/tooltip in + non-GNOME environments + Based on patches by Markus Schmidt and + David Mohammed + 2023-12-15 Guido Berhoerster po: Update German translations diff -Nru plank-0.11.89+git20231215.b5329fd4/configure plank-0.11.89+git20231220.7d76a21a/configure --- plank-0.11.89+git20231215.b5329fd4/configure 2023-12-15 14:10:30.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/configure 2023-12-20 13:40:39.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for plank 0.11.89.18-b532. +# Generated by GNU Autoconf 2.71 for plank 0.11.89.19-7d76. # # Report bugs to . # @@ -681,8 +681,8 @@ # Identity of this package. PACKAGE_NAME='plank' PACKAGE_TARNAME='plank' -PACKAGE_VERSION='0.11.89.18-b532' -PACKAGE_STRING='plank 0.11.89.18-b532' +PACKAGE_VERSION='0.11.89.19-7d76' +PACKAGE_STRING='plank 0.11.89.19-7d76' PACKAGE_BUGREPORT='https://bugs.launchpad.net/plank' PACKAGE_URL='https://launchpad.net/plank' @@ -1545,7 +1545,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures plank 0.11.89.18-b532 to adapt to many kinds of systems. +\`configure' configures plank 0.11.89.19-7d76 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1616,7 +1616,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of plank 0.11.89.18-b532:";; + short | recursive ) echo "Configuration of plank 0.11.89.19-7d76:";; esac cat <<\_ACEOF @@ -1777,7 +1777,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -plank configure 0.11.89.18-b532 +plank configure 0.11.89.19-7d76 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2200,7 +2200,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by plank $as_me 0.11.89.18-b532, which was +It was created by plank $as_me 0.11.89.19-7d76, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3714,7 +3714,7 @@ # Define the identity of the package. PACKAGE='plank' - VERSION='0.11.89.18-b532' + VERSION='0.11.89.19-7d76' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -22665,7 +22665,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by plank $as_me 0.11.89.18-b532, which was +This file was extended by plank $as_me 0.11.89.19-7d76, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22734,7 +22734,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -plank config.status 0.11.89.18-b532 +plank config.status 0.11.89.19-7d76 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Nru plank-0.11.89+git20231215.b5329fd4/debian/changelog plank-0.11.89+git20231220.7d76a21a/debian/changelog --- plank-0.11.89+git20231215.b5329fd4/debian/changelog 2023-12-15 14:12:05.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/debian/changelog 2023-12-20 13:42:16.000000000 +0000 @@ -1,8 +1,8 @@ -plank (0.11.89+git20231215.b5329fd4-0ubuntu1~18.04~ricotz1) bionic; urgency=high +plank (0.11.89+git20231220.7d76a21a-0ubuntu1~18.04~ricotz1) bionic; urgency=high - * New development release of lp:plank 20231215.b5329fd4 + * New development release of lp:plank 20231220.7d76a21a - -- Rico Tzschichholz Fri, 15 Dec 2023 15:12:05 +0100 + -- Rico Tzschichholz Wed, 20 Dec 2023 14:42:16 +0100 plank (0.11.4-2) unstable; urgency=medium diff -Nru plank-0.11.89+git20231215.b5329fd4/lib/PositionManager.vala plank-0.11.89+git20231220.7d76a21a/lib/PositionManager.vala --- plank-0.11.89+git20231215.b5329fd4/lib/PositionManager.vala 2023-12-15 14:10:17.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/lib/PositionManager.vala 2023-12-20 13:40:25.000000000 +0000 @@ -65,7 +65,11 @@ screen.composited_changed.connect (screen_composited_changed); // NOTE don't call update_monitor_geo to avoid a double-call of dockwindow.set_size on startup - screen.get_monitor_geometry (find_monitor_number (screen, controller.prefs.Monitor), out monitor_geo); + if (environment_is_session_desktop (XdgSessionDesktop.GNOME | XdgSessionDesktop.UBUNTU)) { + screen.get_monitor_geometry (find_monitor_number (screen, controller.prefs.Monitor), out monitor_geo); + } else { + monitor_geo = screen.get_monitor_workarea (find_monitor_number (screen, controller.prefs.Monitor)); + } screen_is_composited = screen.is_composited (); } @@ -134,7 +138,11 @@ { var old_monitor_geo = monitor_geo; - screen.get_monitor_geometry (find_monitor_number (screen, controller.prefs.Monitor), out monitor_geo); + if (environment_is_session_desktop (XdgSessionDesktop.GNOME | XdgSessionDesktop.UBUNTU)) { + screen.get_monitor_geometry (find_monitor_number (screen, controller.prefs.Monitor), out monitor_geo); + } else { + monitor_geo = screen.get_monitor_workarea (find_monitor_number (screen, controller.prefs.Monitor)); + } // No need to do anything if nothing has actually changed if (old_monitor_geo.x == monitor_geo.x diff -Nru plank-0.11.89+git20231215.b5329fd4/lib/Widgets/HoverWindow.vala plank-0.11.89+git20231220.7d76a21a/lib/Widgets/HoverWindow.vala --- plank-0.11.89+git20231215.b5329fd4/lib/Widgets/HoverWindow.vala 2023-12-15 14:10:17.000000000 +0000 +++ plank-0.11.89+git20231220.7d76a21a/lib/Widgets/HoverWindow.vala 2023-12-20 13:40:25.000000000 +0000 @@ -76,7 +76,11 @@ { unowned Gdk.Screen screen = get_screen (); Gdk.Rectangle monitor; - screen.get_monitor_geometry (screen.get_monitor_at_point (x, y), out monitor); + if (environment_is_session_desktop (XdgSessionDesktop.GNOME | XdgSessionDesktop.UBUNTU)) { + screen.get_monitor_geometry (screen.get_monitor_at_point (x, y), out monitor); + } else { + monitor = screen.get_monitor_workarea (screen.get_monitor_at_point (x, y)); + } // realize and show the window early to have current allocation-dimensions // this is also needed for being able to move override-redirect windows