Skip to content

Commit 23f7023

Browse files
authored
Merge pull request #3044 from MirServer/tips-are-tips
Reduce scope for confusion between Tips and Gloss
2 parents da0c8fa + ce595be commit 23f7023

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/server/frontend_wayland/wl_shell.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class WlShellSurface : public wayland::ShellSurface, public WindowWlSurfaceRole
6565
mir::shell::SurfaceSpecification mods;
6666

6767
if (flags & mw::ShellSurface::Transient::inactive)
68-
mods.type = mir_window_type_gloss;
68+
mods.type = mir_window_type_tip;
6969
if (auto parent = parent_surface.scene_surface())
7070
mods.parent = parent.value();
7171
mods.aux_rect = geom::Rectangle{{x, y}, {}};
@@ -118,7 +118,7 @@ class WlShellSurface : public wayland::ShellSurface, public WindowWlSurfaceRole
118118
mir::shell::SurfaceSpecification mods;
119119

120120
if (flags & mw::ShellSurface::Transient::inactive)
121-
mods.type = mir_window_type_gloss;
121+
mods.type = mir_window_type_tip;
122122
if (auto parent = parent_surface.scene_surface())
123123
mods.parent = parent.value();
124124
mods.aux_rect = geom::Rectangle{{x, y}, {}};

src/server/frontend_wayland/xdg_shell_stable.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ mf::XdgPopupStable::XdgPopupStable(
320320
xdg_surface{xdg_surface}
321321
{
322322
positioner.ensure_complete();
323-
positioner.type = mir_window_type_gloss;
323+
positioner.type = mir_window_type_tip;
324324
if (parent_role)
325325
{
326326
if (auto scene_surface = parent_role.value()->scene_surface())

src/server/frontend_wayland/xdg_shell_v6.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ mf::XdgPopupV6::XdgPopupV6(
318318
auto const& parent_role = parent_surface->window_role();
319319
auto parent_scene_surface = parent_role ? parent_role.value().scene_surface() : std::nullopt;
320320

321-
specification->type = mir_window_type_gloss;
321+
specification->type = mir_window_type_tip;
322322
if (parent_scene_surface)
323323
specification->parent = parent_scene_surface.value();
324324
else

src/server/frontend_xwayland/xwayland_surface.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ auto wm_window_type_to_mir_window_type(
216216
wm_type == connection->_NET_WM_WINDOW_TYPE_DND ||
217217
wm_type == connection->_NET_WM_WINDOW_TYPE_DIALOG)
218218
{
219-
return mir_window_type_gloss;
219+
return mir_window_type_tip;
220220
}
221221
else if (mir::verbose_xwayland_logging_enabled())
222222
{
@@ -231,7 +231,7 @@ auto wm_window_type_to_mir_window_type(
231231
// be taken as _NET_WM_WINDOW_TYPE_NORMAL."
232232
if (is_transient_for && !override_redirect)
233233
{
234-
return mir_window_type_gloss;
234+
return mir_window_type_tip;
235235
}
236236
else
237237
{

0 commit comments

Comments
 (0)