Commit 8d4c92a7 authored by hybrid's avatar hybrid

Added isFulscreen method.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1384 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 966db1ea
...@@ -159,6 +159,10 @@ namespace irr ...@@ -159,6 +159,10 @@ namespace irr
/** \return True if window is minimized. */ /** \return True if window is minimized. */
virtual bool isWindowMinimized() const = 0; virtual bool isWindowMinimized() const = 0;
//! Checks if the Irrlicht window is running in fullscreen mode
/** \return True if window is fullscreen. */
virtual bool isFullscreen() const = 0;
//! Notifies the device that it should close itself. //! Notifies the device that it should close itself.
/** IrrlichtDevice::run() will always return false after closeDevice() was called. */ /** IrrlichtDevice::run() will always return false after closeDevice() was called. */
virtual void closeDevice() = 0; virtual void closeDevice() = 0;
......
...@@ -234,6 +234,12 @@ void CIrrDeviceStub::setInputReceivingSceneManager(scene::ISceneManager* sceneMa ...@@ -234,6 +234,12 @@ void CIrrDeviceStub::setInputReceivingSceneManager(scene::ISceneManager* sceneMa
} }
//! Checks if the window is running in fullscreen mode
bool CIrrDeviceStub::isFullscreen() const
{
return CreationParams.Fullscreen;
}
} // end namespace irr } // end namespace irr
...@@ -73,12 +73,10 @@ namespace irr ...@@ -73,12 +73,10 @@ namespace irr
//! \return Returns a pointer to the mouse cursor control interface. //! \return Returns a pointer to the mouse cursor control interface.
virtual gui::ICursorControl* getCursorControl(); virtual gui::ICursorControl* getCursorControl();
//! \return Returns a pointer to a list with all video modes supported //! Returns a pointer to a list with all video modes supported by the gfx adapter.
//! by the gfx adapter.
virtual video::IVideoModeList* getVideoModeList(); virtual video::IVideoModeList* getVideoModeList();
//! \return Returns a pointer to the ITimer object. With it the //! Returns a pointer to the ITimer object. With it the current Time can be received.
//! current Time can be received.
virtual ITimer* getTimer(); virtual ITimer* getTimer();
//! Returns the version of the engine. //! Returns the version of the engine.
...@@ -90,24 +88,27 @@ namespace irr ...@@ -90,24 +88,27 @@ namespace irr
//! Sets a new event receiver to receive events //! Sets a new event receiver to receive events
virtual void setEventReceiver(IEventReceiver* receiver); virtual void setEventReceiver(IEventReceiver* receiver);
//! Returns poinhter to the current event receiver. Returns 0 if there is none. //! Returns pointer to the current event receiver. Returns 0 if there is none.
virtual IEventReceiver* getEventReceiver(); virtual IEventReceiver* getEventReceiver();
//! Sets the input receiving scene manager. //! Sets the input receiving scene manager.
/** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */ /** If set to null, the main scene manager (returned by GetSceneManager()) will receive the input */
virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager); virtual void setInputReceivingSceneManager(scene::ISceneManager* sceneManager);
//! \return Returns a pointer to the logger. //! Returns a pointer to the logger.
virtual ILogger* getLogger(); virtual ILogger* getLogger();
//! Returns the operation system opertator object. //! Returns the operation system opertator object.
virtual IOSOperator* getOSOperator(); virtual IOSOperator* getOSOperator();
//! Checks if the window is running in fullscreen mode.
virtual bool isFullscreen() const;
protected: protected:
void createGUIAndScene(); void createGUIAndScene();
//! checks version of sdk and prints warning if there might be a problem //! checks version of SDK and prints warning if there might be a problem
bool checkVersion(const char* version); bool checkVersion(const char* version);
video::IVideoDriver* VideoDriver; video::IVideoDriver* VideoDriver;
......
...@@ -279,7 +279,7 @@ namespace irr ...@@ -279,7 +279,7 @@ namespace irr
//! constructor //! constructor
CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params) CIrrDeviceWin32::CIrrDeviceWin32(const SIrrlichtCreationParameters& params)
: CIrrDeviceStub(params), HWnd(0), ChangedToFullScreen(false), : CIrrDeviceStub(params), HWnd(0), ChangedToFullScreen(false),
FullScreen(CreationParams.Fullscreen), IsNonNTWindows(false), Resized(false), IsNonNTWindows(false), Resized(false),
ExternalWindow(false), Win32CursorControl(0) ExternalWindow(false), Win32CursorControl(0)
{ {
...@@ -916,7 +916,7 @@ void CIrrDeviceWin32::OnResized() ...@@ -916,7 +916,7 @@ void CIrrDeviceWin32::OnResized()
//! Sets if the window should be resizeable in windowed mode. //! Sets if the window should be resizeable in windowed mode.
void CIrrDeviceWin32::setResizeAble(bool resize) void CIrrDeviceWin32::setResizeAble(bool resize)
{ {
if (ExternalWindow || !getVideoDriver() || FullScreen) if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
return; return;
LONG style = WS_POPUP; LONG style = WS_POPUP;
......
...@@ -246,7 +246,6 @@ namespace irr ...@@ -246,7 +246,6 @@ namespace irr
HWND HWnd; HWND HWnd;
bool ChangedToFullScreen; bool ChangedToFullScreen;
bool FullScreen;
bool IsNonNTWindows; bool IsNonNTWindows;
bool Resized; bool Resized;
bool ExternalWindow; bool ExternalWindow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment