diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-05-10 07:30:49 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-05-10 07:30:49 +0000 |
| commit | bcdb768272d4e982b2a344e803362e0453a065bb (patch) | |
| tree | b0e10df2c3f8431f3ed95158774378003dfc2f34 | |
| parent | Wayland fix. (diff) | |
| download | inkscape-bcdb768272d4e982b2a344e803362e0453a065bb.tar.gz inkscape-bcdb768272d4e982b2a344e803362e0453a065bb.zip | |
Remove unused floatscreenissue variable and supporting code.
(Previous commit shows how to fix it for Wayland if it were ever to be needed.)
(bzr r15684)
| -rw-r--r-- | src/ui/uxmanager.cpp | 35 | ||||
| -rw-r--r-- | src/ui/uxmanager.h | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 15663af57..c2f0dc5c4 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -101,11 +101,9 @@ public: virtual gint getDefaultTask( SPDesktop *desktop ); virtual void setTask(SPDesktop* dt, gint val); - virtual bool isFloatWindowProblem() const; virtual bool isWidescreen() const; private: - bool _floatwindowIssues; bool _widescreen; }; @@ -127,7 +125,6 @@ UXManager::~UXManager() } UXManagerImpl::UXManagerImpl() : - _floatwindowIssues(false), _widescreen(false) { ege::TagSet tags; @@ -136,33 +133,6 @@ UXManagerImpl::UXManagerImpl() : tags.addTag(ege::Tag("General")); tags.addTag(ege::Tag("Icons")); -// Nobody seems to use floatwindowIssues... we can probably delete all this code! -// See: https://developer.gnome.org/gdk3/stable/gdk3-Wayland-Interaction.html - GdkDisplay* display = gdk_display_get_default(); -#ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (display) ) { - // std::cout << "Using Wayland!" << std::endl; - } -#endif - -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (display) ) { - // std::cout << "Using X11!" << std::endl; - char const* wmName = gdk_x11_screen_get_window_manager_name( gdk_screen_get_default() ); - //g_message("Window manager is [%s]", wmName); - - //if (g_ascii_strcasecmp( wmName, UNKOWN_WINDOW_MANAGER_NAME ) == 0) { - if (g_ascii_strcasecmp( wmName, KDE_WINDOW_MANAGER_NAME ) == 0) { - _floatwindowIssues = true; - } - } -#endif - -#ifdef GDK_WINDOWING_WIN32 - _floatwindowIssues = true; -#endif // GDK_WINDOWING_WIN32 - - Glib::RefPtr<Gdk::Screen> defaultScreen = Gdk::Screen::get_default(); if (defaultScreen) { int width = defaultScreen->get_width(); @@ -178,11 +148,6 @@ UXManagerImpl::~UXManagerImpl() { } -bool UXManagerImpl::isFloatWindowProblem() const -{ - return _floatwindowIssues; -} - bool UXManagerImpl::isWidescreen() const { return _widescreen; diff --git a/src/ui/uxmanager.h b/src/ui/uxmanager.h index 711703192..f91bde25e 100644 --- a/src/ui/uxmanager.h +++ b/src/ui/uxmanager.h @@ -35,7 +35,6 @@ public: virtual gint getDefaultTask( SPDesktop *desktop ) = 0; virtual void setTask( SPDesktop* dt, gint val ) = 0; - virtual bool isFloatWindowProblem() const = 0; virtual bool isWidescreen() const = 0; protected: |
