Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 2.18.3 #3624

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Release 2.18.3 #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9b49b
Ensure windows are placed and repainted on X11 "CONFIGURE" (#3619)
AlanGriffiths Oct 7, 2024
877a2c9
Release 2.18.3
Saviq Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

set(MIR_VERSION_MAJOR 2)
set(MIR_VERSION_MINOR 18)
set(MIR_VERSION_PATCH 2)
set(MIR_VERSION_PATCH 3)

add_compile_definitions(MIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
add_compile_definitions(MIR_VERSION_MINOR=${MIR_VERSION_MINOR})
Expand Down
9 changes: 9 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
mir (2.18.3) UNRELEASED; urgency=medium

* Hotfix release 2.18.3

Enhancements:
. Ensure windows are placed and repainted on X11 "CONFIGURE" #3619

-- Michał Sawicz <michal.sawicz@canonical.com> Mon, 07 Oct 2024 15:04:33 +0200

mir (2.18.2) UNRELEASED; urgency=medium

* Bugfix release 2.18.2
Expand Down
17 changes: 15 additions & 2 deletions examples/mir-x11-kiosk/x11_kiosk_window_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ auto X11KioskWindowManagerPolicy::place_new_window(ApplicationInfo const& app_in
(!specification.parent().is_set() || !specification.parent().value().lock()))
{
specification.state() = mir_window_state_fullscreen;
specification.size() = mir::optional_value<Size>{}; // Ignore requested size (if any) when we maximize
specification.size() = mir::optional_value<Size>{}; // Ignore requested size (if any) when we fullscreen
specification.top_left() = mir::optional_value<Point>{}; // Ignore requested position (if any) when we fullscreen
tools.place_and_size_for_state(specification, WindowInfo{});

if (!request.state().is_set() || request.state().value() != mir_window_state_restored)
Expand All @@ -94,8 +95,20 @@ void X11KioskWindowManagerPolicy::handle_modify_window(WindowInfo& window_info,
if ((window_info.type() == mir_window_type_normal || window_info.type() == mir_window_type_freestyle) &&
!window_info.parent())
{
if (window_info.state() == mir_window_state_fullscreen && modifications.state().is_set())
{
// If the window is already fullscreen, then first restore it
// as otherwise the client may not repaint
WindowSpecification mods;
mods.state() = mir_window_state_restored;

tools.place_and_size_for_state(mods, window_info);
tools.modify_window(window_info, mods);
}

specification.state() = mir_window_state_fullscreen;
specification.size() = mir::optional_value<Size>{}; // Ignore requested size (if any) when we maximize
specification.size() = mir::optional_value<Size>{}; // Ignore requested size (if any) when we fullscreen
specification.top_left() = mir::optional_value<Point>{}; // Ignore requested position (if any) when we fullscreen
tools.place_and_size_for_state(specification, window_info);

if (!modifications.state().is_set() || modifications.state().value() != mir_window_state_restored)
Expand Down
Loading