SDL import fix

XITRIX · Dec 17, 2024 · 55cc542 · 55cc542
1 parent 123bf32
commit 55cc542
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/Submodules/UIKit/include/Application.h b/Submodules/UIKit/include/Application.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL.h>
+#include <SDL_events.h>
 #include "include/gpu/ganesh/GrDirectContext.h"
 #include "tools/window/WindowContext.h"
 #include "SkiaCtx.h"

diff --git a/Submodules/UIKit/include/CGImage.h b/Submodules/UIKit/include/CGImage.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <SDL.h>
-//#include <SDL_gpu.h>
 #include <optional>
 #include <memory>
 #include <NXData.h>

diff --git a/Submodules/UIKit/include/SkiaCtx.h b/Submodules/UIKit/include/SkiaCtx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL.h>
+#include "SDL_video.h"
 #include <memory>
 #include "include/core/SkSurface.h"
 #include <functional>

diff --git a/Submodules/UIKit/include/UIApplication.h b/Submodules/UIKit/include/UIApplication.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <SDL.h>
+#include <SDL_events.h>
 
 #include <UIApplicationDelegate.h>
 #include <UIWindow.h>

diff --git a/Submodules/UIKit/lib/UIApplication.cpp b/Submodules/UIKit/lib/UIApplication.cpp
@@ -1,4 +1,5 @@
 #include <UIApplication.h>
+#include <SDL.h>
 
 using namespace NXKit;
 

diff --git a/Submodules/UIKit/lib/UILabel.cpp b/Submodules/UIKit/lib/UILabel.cpp
@@ -53,7 +53,12 @@ void UILabel::draw() {
 
     SkBitmap bitmap;
     auto scale = SkiaCtx::main()->getScaleFactor();
-    auto size = layer()->presentationOrSelf()->bounds().size;
+    NXSize size;
+    if (contentMode() == UIViewContentMode::redraw) {
+        size = layer()->presentationOrSelf()->bounds().size;
+    } else {
+        size = bounds().size;
+    }
     auto bitmapSize = size * scale;
     bitmap.allocPixels(SkImageInfo::MakeN32Premul(bitmapSize.width, bitmapSize.height));
     SkCanvas canvas(bitmap);

diff --git a/Submodules/UIKit/lib/platforms/SkiaCtx_sdlBase.cpp b/Submodules/UIKit/lib/platforms/SkiaCtx_sdlBase.cpp
@@ -1,4 +1,5 @@
 #include <platforms/SkiaCtx_sdlBase.h>
+#include <SDL.h>
 
 using namespace NXKit;
 
@@ -43,4 +44,4 @@ float SkiaCtx_sdlBase::getScaleFactor() {
     SDL_GetWindowSize(window, &w, &h);
     SDL_GL_GetDrawableSize(window, &dw, &dh);
     return (float)dw / (float)w;
-}
+}
diff --git a/app/Screens/TestViewController/TestViewController.cpp b/app/Screens/TestViewController/TestViewController.cpp
@@ -105,7 +105,7 @@ void TestViewController::loadView() {
     label->setText("Привет\nебать,\nэто\nкириллица,\nнахуй!!!!");
     label->setTextAlignment(NSTextAlignment::center);
     label->setBackgroundColor(UIColor::red);
-    label->setContentMode(NXKit::UIViewContentMode::redraw);
+//    label->setContentMode(NXKit::UIViewContentMode::redraw);
     rootView->addSubview(label);
 
     auto blur = new_shared<UIBlurView>();