mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2024-12-27 05:58:22 +01:00
Compare commits
No commits in common. "08c05491a27e068e8a9cca806f6abdb2bf389b90" and "be6de41cc760eba3bd6beff0bba6539ef74650e1" have entirely different histories.
08c05491a2
...
be6de41cc7
@ -4,7 +4,7 @@ LICENSE = "MIT"
|
|||||||
LIC_FILES_CHKSUM = "file://../LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
|
LIC_FILES_CHKSUM = "file://../LICENSE;md5=e0f1d50df739a9fb8eae12a8f37ce352"
|
||||||
|
|
||||||
# Note: meta-qt6 is needed
|
# Note: meta-qt6 is needed
|
||||||
DEPENDS = "qtbase hyprutils"
|
DEPENDS = "qtbase"
|
||||||
RDEPENDS:${PN} = "qtwayland"
|
RDEPENDS:${PN} = "qtwayland"
|
||||||
RRECOMMENDS:${PN} = "qgnomeplatform"
|
RRECOMMENDS:${PN} = "qgnomeplatform"
|
||||||
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
|
SRC_URI = "gitsm://github.com/hyprwm/xdg-desktop-portal-hyprland.git;protocol=https;nobranch=1"
|
||||||
SRCREV = "3e884d941ca819c1f2e50df8bdae0debded1ed87"
|
SRCREV = "05f4271dfc5d4cef9710db654eb1dd9894a16ac0"
|
||||||
PV = "1.3.8"
|
PV = "1.3.7"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
|
SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
|
||||||
SRCREV = "3dcca4c0d40925fbb69a67be54eef1cf8730843c"
|
SRCREV = "2530394e67b436f4aea8225111cf37c1403ccb78"
|
||||||
|
|
||||||
# Hack to allow patching the plugins
|
# Hack to allow patching the plugins
|
||||||
do_configure:prepend() {
|
do_configure:prepend() {
|
||||||
|
@ -22,7 +22,6 @@ DEPENDS += " \
|
|||||||
libxkbcommon \
|
libxkbcommon \
|
||||||
pango \
|
pango \
|
||||||
pixman \
|
pixman \
|
||||||
re2 \
|
|
||||||
tomlplusplus \
|
tomlplusplus \
|
||||||
util-linux-libuuid \
|
util-linux-libuuid \
|
||||||
virtual/egl \
|
virtual/egl \
|
||||||
@ -44,8 +43,8 @@ RRECOMMENDS:${PN} ?= " \
|
|||||||
|
|
||||||
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;nobranch=1"
|
SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;nobranch=1"
|
||||||
|
|
||||||
SRCREV = "788ae588979c2a1ff8a660f16e3c502ef5796755"
|
SRCREV = "9f7a96b997d90c4c188f3837e02859a25a05611e"
|
||||||
PV = "0.46.0"
|
PV = "0.45.2"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit meson pkgconfig features_check
|
inherit meson pkgconfig features_check
|
||||||
|
@ -0,0 +1,49 @@
|
|||||||
|
From d34f18114d634a7a0769259b9453121d1e738de6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Markus Volk <f_l_k@t-online.de>
|
||||||
|
Date: Sat, 14 Dec 2024 17:59:40 +0100
|
||||||
|
Subject: [PATCH] sFullscreenState->SFullscreenState
|
||||||
|
|
||||||
|
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||||
|
---
|
||||||
|
src/Overview.cpp | 4 ++--
|
||||||
|
src/Render.cpp | 6 +++---
|
||||||
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/Overview.cpp b/src/Overview.cpp
|
||||||
|
index d28da70..38d61fd 100644
|
||||||
|
--- a/src/Overview.cpp
|
||||||
|
+++ b/src/Overview.cpp
|
||||||
|
@@ -41,7 +41,7 @@ void CHyprspaceWidget::show() {
|
||||||
|
if (ws->m_efFullscreenMode == FSMODE_FULLSCREEN) w->m_bWantsInitialFullscreen = true;
|
||||||
|
// we use the getWindowFromHandle function to prevent dangling pointers
|
||||||
|
prevFullscreen.emplace_back(std::make_tuple((uint32_t)(((uint64_t)w.get()) & 0xFFFFFFFF), ws->m_efFullscreenMode));
|
||||||
|
- g_pCompositor->setWindowFullscreenState(w, sFullscreenState{.internal = FSMODE_NONE, .client = FSMODE_NONE});
|
||||||
|
+ g_pCompositor->setWindowFullscreenState(w, SFullscreenState{.internal = FSMODE_NONE, .client = FSMODE_NONE});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -108,7 +108,7 @@ void CHyprspaceWidget::hide() {
|
||||||
|
for (auto& fs : prevFullscreen) {
|
||||||
|
const auto w = g_pCompositor->getWindowFromHandle(std::get<0>(fs));
|
||||||
|
const auto oFullscreenMode = std::get<1>(fs);
|
||||||
|
- g_pCompositor->setWindowFullscreenState(w, sFullscreenState(oFullscreenMode));
|
||||||
|
+ g_pCompositor->setWindowFullscreenState(w, SFullscreenState(oFullscreenMode));
|
||||||
|
if (oFullscreenMode == FSMODE_FULLSCREEN) w->m_bWantsInitialFullscreen = false;
|
||||||
|
}
|
||||||
|
prevFullscreen.clear();
|
||||||
|
diff --git a/src/Render.cpp b/src/Render.cpp
|
||||||
|
index eaac216..23d77c5 100644
|
||||||
|
--- a/src/Render.cpp
|
||||||
|
+++ b/src/Render.cpp
|
||||||
|
@@ -23,7 +23,7 @@ void renderWindowStub(PHLWINDOW pWindow, PHLMONITOR pMonitor, PHLWORKSPACE pWork
|
||||||
|
g_pHyprOpenGL->m_RenderData.renderModif.modifs.push_back({SRenderModifData::eRenderModifType::RMOD_TYPE_SCALE, curScaling});
|
||||||
|
g_pHyprOpenGL->m_RenderData.renderModif.enabled = true;
|
||||||
|
pWindow->m_pWorkspace = pWorkspaceOverride;
|
||||||
|
- pWindow->m_sFullscreenState = sFullscreenState{FSMODE_NONE}; // FIXME: still do nothing, fullscreen requests not reject when overview active
|
||||||
|
+ pWindow->m_sFullscreenState = SFullscreenState{FSMODE_NONE}; // FIXME: still do nothing, fullscreen requests not reject when overview active
|
||||||
|
pWindow->m_sWindowData.nearestNeighbor = false; // FIX: this wont do, need to scale surface texture down properly so that windows arent shown as pixelated mess
|
||||||
|
pWindow->m_bIsFloating = false; // weird shit happened so hack fix
|
||||||
|
pWindow->m_bPinned = true;
|
||||||
|
--
|
||||||
|
2.47.1
|
||||||
|
|
@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://github.com/KZDKM/Hyprspace.git;protocol=https;branch=main \
|
git://github.com/KZDKM/Hyprspace.git;protocol=https;branch=main \
|
||||||
|
file://0001-sFullscreenState-SFullscreenState.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRCREV = "e2d561c933cd085d68bf0b39c4f78870ad0abbc2"
|
SRCREV = "3107652c5390bfe5efa685722152c3f30e2cb153"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
DEPENDS += " \
|
DEPENDS += " \
|
||||||
|
Loading…
Reference in New Issue
Block a user