Browse Source

Rename Graphics::RaiseWindow to Graphics::Raise.

Eugene Kozlov 8 years ago
parent
commit
293370db1f
2 changed files with 11 additions and 9 deletions
  1. 8 6
      Source/Urho3D/Graphics/Graphics.cpp
  2. 3 3
      Source/Urho3D/Graphics/Graphics.h

+ 8 - 6
Source/Urho3D/Graphics/Graphics.cpp

@@ -243,6 +243,14 @@ void Graphics::Minimize()
     SDL_MinimizeWindow(window_);
 }
 
+void Graphics::Raise() const
+{
+    if (!window_)
+        return;
+
+    SDL_RaiseWindow(window_);
+}
+
 void Graphics::BeginDumpShaders(const String& fileName)
 {
     shaderPrecache_ = new ShaderPrecache(context_, fileName);
@@ -384,12 +392,6 @@ bool Graphics::GetMaximized() const
     return SDL_GetWindowFlags(window_) & SDL_WINDOW_MAXIMIZED;
 }
 
-void Graphics::RaiseWindow() const
-{
-    if (window_)
-        SDL_RaiseWindow(window_);
-}
-
 Vector3 Graphics::GetDisplayDPI() const
 {
     Vector3 result;

+ 3 - 3
Source/Urho3D/Graphics/Graphics.h

@@ -311,7 +311,7 @@ public:
 
     /// Return whether the main window is using sRGB conversion on write.
     bool GetSRGB() const { return sRGB_; }
-    
+
     /// Return whether rendering output is dithered.
     bool GetDither() const;
 
@@ -496,6 +496,8 @@ public:
     void Maximize();
     /// Minimize the window.
     void Minimize();
+    /// Raises window if it was minimized.
+    void Raise() const;
     /// Add a GPU object to keep track of. Called by GPUObject.
     void AddGPUObject(GPUObject* object);
     /// Remove a GPU object. Called by GPUObject.
@@ -566,8 +568,6 @@ public:
     int GetCurrentMonitor() const;
     /// Returns true if window is maximized or runs in full screen mode.
     bool GetMaximized() const;
-    /// Raises window if it was minimized.
-    void RaiseWindow() const;
     /// Return display dpi information: (hdpi, vdpi, ddpi). On failure returns zero vector.
     Vector3 GetDisplayDPI() const;