]> git.sesse.net Git - casparcg/commitdiff
Allow ogl window to be borderless. I found this useful in integrating a "preview...
authorTK3 <tomkaltz@gmail.com>
Fri, 1 Nov 2013 20:43:56 +0000 (16:43 -0400)
committerTK3 <tomkaltz@gmail.com>
Fri, 1 Nov 2013 20:43:56 +0000 (16:43 -0400)
<borderless>true</borderless>
or
ADD 1 SCREEN BORDERLESS

modules/ogl/consumer/ogl_consumer.cpp

index 079b1526c0c8f6c513cd4a30e4fbf9f70737a4be..3c6234eabfcb8faddbd61afe12848f5048f06ee6 100644 (file)
@@ -101,6 +101,7 @@ struct configuration
        bool                    key_only;\r
        aspect_ratio    aspect; \r
        bool                    vsync;\r
+       bool                    borderless;\r
 \r
        configuration()\r
                : name(L"Screen consumer")\r
@@ -111,6 +112,7 @@ struct configuration
                , key_only(false)\r
                , aspect(aspect_invalid)\r
                , vsync(false)\r
+               , borderless(false)\r
        {\r
        }\r
 };\r
@@ -216,7 +218,7 @@ public:
                if(!GLEW_VERSION_2_1)\r
                        BOOST_THROW_EXCEPTION(not_supported() << msg_info("Missing OpenGL 2.1 support."));\r
 \r
-               window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(print()), config_.windowed ? sf::Style::Resize | sf::Style::Close : sf::Style::Fullscreen);\r
+               window_.Create(sf::VideoMode(screen_width_, screen_height_, 32), narrow(print()), config_.borderless ? sf::Style::None : (config_.windowed ? sf::Style::Resize | sf::Style::Close : sf::Style::Fullscreen));\r
                window_.ShowMouseCursor(false);\r
                window_.SetPosition(screen_x_, screen_y_);\r
                window_.SetSize(screen_width_, screen_height_);\r
@@ -607,6 +609,7 @@ safe_ptr<core::frame_consumer> create_consumer(const core::parameters& params)
        config.windowed = !params.has(L"FULLSCREEN");\r
        config.key_only = params.has(L"KEY_ONLY");\r
        config.name = params.get(L"NAME", config.name);\r
+       config.borderless = params.has(L"BORDERLESS");\r
 \r
        return make_safe<ogl_consumer_proxy>(config);\r
 }\r
@@ -620,6 +623,7 @@ safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::wptre
        config.key_only                 = ptree.get(L"key-only", config.key_only);\r
        config.auto_deinterlace = ptree.get(L"auto-deinterlace", config.auto_deinterlace);\r
        config.vsync                    = ptree.get(L"vsync", config.vsync);\r
+       config.borderless       = ptree.get(L"borderless", config.borderless);\r
 \r
        auto stretch_str = ptree.get(L"stretch", L"default");\r
        if(stretch_str == L"uniform")\r