Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-15 18:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixup: fix compile against 1423707

Browse source 
Fixes #177
This commit is contained in:
outfoxxed 2024-06-09 18:11:42 -07:00
parent 451ec43f28
commit 144176a37a
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
flake.lock generated
View file

@ -16,11 +16,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716327911, "lastModified": 1717181720,
"narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1716491954, "lastModified": 1717970802,
"narHash": "sha256-Qf1mEPacXhhM5KFm7HG2F/UBfzkjSBK57gKquA5TAVY=", "narHash": "sha256-kFnaAmte/N1mrbHEQyrwDu9+laZzVAi4N2nQodCNfgg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4e42107d25dc47ee94da282db233f85f1e4c6bd0", "rev": "1423707dbefc0329e80895451903a77ab684f7ea",
"revCount": 4733, "revCount": 4789,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715791527, "lastModified": 1716473782,
"narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", "rev": "87d5d984109c839482b88b4795db073eb9ed446f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716058375, "lastModified": 1717784906,
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "3afed4364790aebe0426077631af1e164a9650cc", "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716330097, "lastModified": 1717602782,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
src/TabGroup.cpp
View file

@ -117,7 +117,7 @@ void Hy3TabBarEntry::prepareTexture(float scale, CBox& box) {
auto rounding = std::min((double) *s_rounding * scale, std::min(width * 0.5, height * 0.5)); auto rounding = std::min((double) *s_rounding * scale, std::min(width * 0.5, height * 0.5));
if (this->texture.m_iTexID == 0 if (this->texture->m_iTexID == 0
// clang-format off // clang-format off
|| this->last_render.x != box.x || this->last_render.x != box.x
|| this->last_render.y != box.y || this->last_render.y != box.y
@ -228,9 +228,9 @@ void Hy3TabBarEntry::prepareTexture(float scale, CBox& box) {
cairo_surface_flush(cairo_surface); cairo_surface_flush(cairo_surface);
auto data = cairo_image_surface_get_data(cairo_surface); auto data = cairo_image_surface_get_data(cairo_surface);
this->texture.allocate(); this->texture->allocate();
glBindTexture(GL_TEXTURE_2D, this->texture.m_iTexID); glBindTexture(GL_TEXTURE_2D, this->texture->m_iTexID);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -244,7 +244,7 @@ void Hy3TabBarEntry::prepareTexture(float scale, CBox& box) {
cairo_destroy(cairo); cairo_destroy(cairo);
cairo_surface_destroy(cairo_surface); cairo_surface_destroy(cairo_surface);
} else { } else {
glBindTexture(GL_TEXTURE_2D, this->texture.m_iTexID); glBindTexture(GL_TEXTURE_2D, this->texture->m_iTexID);
} }
} }

2
src/TabGroup.hpp
View file

@ -15,7 +15,7 @@ class Hy3TabBar;
struct Hy3TabBarEntry { struct Hy3TabBarEntry {
std::string window_title; std::string window_title;
bool destroying = false; bool destroying = false;
CTexture texture; SP<CTexture> texture;
CAnimatedVariable<float> focused; CAnimatedVariable<float> focused;
CAnimatedVariable<float> urgent; CAnimatedVariable<float> urgent;
CAnimatedVariable<float> offset; // 0.0-1.0 of total bar CAnimatedVariable<float> offset; // 0.0-1.0 of total bar