[screen_consumer] #495 Fixed full screen mode

diff --git a/CHANGELOG b/CHANGELOG
index c90fce6e9f23a1fea187523cd65bc3139fc70fc6..7ca45d6999c7fcf63d9ada90eeba91712fb401be 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,8 @@ Consumers
   o Bluefish consumer:\r
     + Largely rewritten against newest SDK, giving support for newer hardware\r
       and features (Satchit Nambiar and James Wise sponsored by Bluefish444).\r
+  o Screen consumer:\r
+    + Fixed full screen mode.\r
 \r
 Producers\r
 ---------\r

diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp
index b992cfb69f12773d79f1be9f959fcd14d1110201..818bdf12e976c237f25faf6c7f946e444b9790c9 100644 (file)
--- a/modules/screen/consumer/screen_consumer.cpp
+++ b/modules/screen/consumer/screen_consumer.cpp
@@ -241,10 +241,20 @@ public:
                        : (config_.windowed
                                ? sf::Style::Resize | sf::Style::Close
                                : sf::Style::Fullscreen);
-               window_.create(sf::VideoMode(screen_width_, screen_height_, 32), u8(print()), window_style);
+               window_.create(sf::VideoMode::getDesktopMode(), u8(print()), window_style);
+
+               if (config_.windowed)
+               {
+                       window_.setPosition(sf::Vector2i(screen_x_, screen_y_));
+                       window_.setSize(sf::Vector2u(screen_width_, screen_height_));
+               }
+               else
+               {
+                       screen_width_   = window_.getSize().x;
+                       screen_height_  = window_.getSize().y;
+               }
+
                window_.setMouseCursorVisible(config_.interactive);
-               window_.setPosition(sf::Vector2i(screen_x_, screen_y_));
-               window_.setSize(sf::Vector2u(screen_width_, screen_height_));
                window_.setActive();
 
                if(!GLEW_VERSION_2_1 && glewInit() != GLEW_OK)