From f448ec11e7f03bd25d9e578ba95a921edbad20e1 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Wed, 29 Mar 2017 18:34:22 +0200 Subject: [PATCH] [screen_consumer] #495 Fixed full screen mode --- CHANGELOG | 2 ++ modules/screen/consumer/screen_consumer.cpp | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c90fce6e9..7ca45d699 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -49,6 +49,8 @@ Consumers o Bluefish consumer: + Largely rewritten against newest SDK, giving support for newer hardware and features (Satchit Nambiar and James Wise sponsored by Bluefish444). + o Screen consumer: + + Fixed full screen mode. Producers --------- diff --git a/modules/screen/consumer/screen_consumer.cpp b/modules/screen/consumer/screen_consumer.cpp index b992cfb69..818bdf12e 100644 --- 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) -- 2.39.2