2023-08-07 11:17:44 +02:00
|
|
|
From 663278d168152f990cf76a3df9d31ca4c6511604 Mon Sep 17 00:00:00 2001
|
|
|
|
Message-Id: <663278d168152f990cf76a3df9d31ca4c6511604.1690371072.git.agx@sigxcpu.org>
|
|
|
|
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
|
|
Date: Fri, 1 Jan 2021 13:58:55 +0100
|
|
|
|
Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors"
|
2023-01-10 17:47:05 +01:00
|
|
|
|
2023-08-07 11:17:44 +02:00
|
|
|
This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3.
|
|
|
|
|
|
|
|
Revert this until phosh has a fixed release.
|
2023-01-10 17:47:05 +01:00
|
|
|
---
|
|
|
|
types/wlr_layer_shell_v1.c | 20 --------------------
|
|
|
|
1 file changed, 20 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c
|
2023-08-07 11:17:44 +02:00
|
|
|
index fa054d3c..062fa96d 100644
|
2023-01-10 17:47:05 +01:00
|
|
|
--- a/types/wlr_layer_shell_v1.c
|
|
|
|
+++ b/types/wlr_layer_shell_v1.c
|
2023-08-07 11:17:44 +02:00
|
|
|
@@ -316,26 +316,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
|
|
|
|
struct wlr_layer_surface_v1 *surface =
|
|
|
|
wlr_layer_surface_v1_from_wlr_surface(wlr_surface);
|
2023-01-10 17:47:05 +01:00
|
|
|
|
|
|
|
- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
|
|
|
- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
|
|
|
- if (surface->pending.desired_width == 0 &&
|
|
|
|
- (surface->pending.anchor & horiz) != horiz) {
|
|
|
|
- wl_resource_post_error(surface->resource,
|
|
|
|
- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
|
|
|
|
- "width 0 requested without setting left and right anchors");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
|
|
|
- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
|
|
|
- if (surface->pending.desired_height == 0 &&
|
|
|
|
- (surface->pending.anchor & vert) != vert) {
|
|
|
|
- wl_resource_post_error(surface->resource,
|
|
|
|
- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE,
|
|
|
|
- "height 0 requested without setting top and bottom anchors");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
surface->current = surface->pending;
|
|
|
|
surface->pending.committed = 0;
|
|
|
|
|
2023-08-07 11:17:44 +02:00
|
|
|
--
|
|
|
|
2.40.1
|
|
|
|
|