+状态机测试代码

1 files changed, 19 insertions, 3 deletions

diff --git a/src/libjin/Graphics/je_window.cpp b/src/libjin/Graphics/je_window.cpp
index 86ccd29..c14d290 100644
--- a/src/libjin/Graphics/je_window.cpp
+++ b/src/libjin/Graphics/je_window.cpp
@@ -3,6 +3,7 @@
 
 #include <iostream>
 
+#include "../common/je_exception.h"
 #include "../utils/je_utils.h"
 #include "../audio/sdl/je_sdl_audio.h"
 #include "../utils/je_log.h"
@@ -30,8 +31,9 @@ namespace JinEngine
 			mSize.w            = setting->width;
             mSize.h            = setting->height;
 			mFps               = setting->fps;
-			bool vsync        = setting->vsync;
-			const char* title = setting->title;
+			bool vsync         = setting->vsync;
+			const char* title  = setting->title;
+            const char* icon   = setting->icon;
 
 			if (mWnd)
 			{
@@ -58,13 +60,27 @@ namespace JinEngine
 			int wx = SDL_WINDOWPOS_UNDEFINED,
 				wy = SDL_WINDOWPOS_UNDEFINED;
         
-			int flag = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL;
+			int flag = SDL_WINDOW_HIDDEN | SDL_WINDOW_OPENGL;
 			if (setting->fullscreen) flag |= SDL_WINDOW_FULLSCREEN;
 			if (setting->resizable) flag |= SDL_WINDOW_RESIZABLE;
 
             mWnd = SDL_CreateWindow(title, wx, wy, mSize.w, mSize.h, flag);
 			if (mWnd == NULL)
 				return false;
+
+            // Set window icon
+            try
+            {
+                Bitmap* bitmap = Bitmap::createBitmap(icon);
+                SDL_Surface *surface;
+                Color* pixels = const_cast<Color*>(bitmap->getPixels());
+                uint w = bitmap->getWidth(), h = bitmap->getHeight();
+                surface = SDL_CreateRGBSurfaceFrom(
+                    pixels, w, h, 32, w * 4, Color::RMASK, Color::GMASK, Color::BMASK, Color::AMASK);
+                SDL_SetWindowIcon(mWnd, surface);
+                SDL_FreeSurface(surface);
+            } catch (...) {}
+
 			ctx = SDL_GL_CreateContext(mWnd);
 			if (ctx == NULL) 
 				return false;