From 9bb11133522836a9c5e251550ac88c9a4e091c0e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 30 May 2014 12:46:49 +0300 Subject: Move main window related code into windowmanager. --- src/client.h | 64 +----------------------------------------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) (limited to 'src/client.h') diff --git a/src/client.h b/src/client.h index 96ca7d2c8..10542a29c 100644 --- a/src/client.h +++ b/src/client.h @@ -89,69 +89,19 @@ public: State getState() const A_WARN_UNUSED { return mState; } - bool getIsMinimized() const A_WARN_UNUSED - { return mIsMinimized; } - - void setIsMinimized(const bool n); - - void newChatMessage(); - - bool getInputFocused() const A_WARN_UNUSED - { return mInputFocused; } - - void setInputFocused(const bool n) - { mInputFocused = n; } - - bool getMouseFocused() const A_WARN_UNUSED - { return mMouseFocused; } - - void setMouseFocused(const bool n) - { mMouseFocused = n; } - - bool isKeyboardVisible() const; - - void setGuiAlpha(const float n) - { mGuiAlpha = n; } - - float getGuiAlpha() const A_WARN_UNUSED - { return mGuiAlpha; } - - void setFramerate(const int fpsLimit) const; - - int getFramerate() const A_WARN_UNUSED; - bool isTmw() const A_WARN_UNUSED; - static void applyGrabMode(); - - static void applyGamma(); - - static void applyVSync(); - - static void applyKeyRepeat(); - void optionChanged(const std::string &name) override final; void action(const ActionEvent &event) override final; void initTradeFilter() const; - void resizeVideo(int actualWidth, - int actualHeight, - const bool always); - - void applyScale(); + void moveButtons(const int width); void windowRemoved(const Window *const window); - void updateScreenKeyboard(const int height) - { mKeyboardHeight = height; } - - void reloadWallpaper(); - private: - static void createWindows(); - void initSoundManager(); void initConfigListeners(); @@ -160,8 +110,6 @@ private: void updateEnv(); - void initTitle(); - static void initFeatures(); void gameClear(); @@ -170,8 +118,6 @@ private: static void logVars(); - void setIcon(); - static void setEnv(const char *const name, const char *const value); #ifdef ANDROID @@ -199,20 +145,12 @@ private: State mState; State mOldState; - SDL_Surface *mIcon; - - FPSmanager mFpsManager; Skin *mSkin; float mGuiAlpha; int mButtonPadding; int mButtonSpacing; int mKeyboardHeight; - bool mLimitFps; bool mConfigAutoSaved; - bool mIsMinimized; - bool mInputFocused; - bool mMouseFocused; - bool mNewMessageFlag; }; extern Client *client; -- cgit v1.2.3-60-g2f50