diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-01-14 10:31:40 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-15 00:36:41 +0000 |
commit | ca93d98343a03026c7568abc2ddda838f10fcbde (patch) | |
tree | 14ff4373b6921261e1d70f35cc286cf24c68039d /vcl/unx | |
parent | e9202ffeccdf6f669184f3f869d2e5b121bea9f3 (diff) |
vcl: rename ambiguous IsMultiDisplay to IsUnifiedDisplay, and simplify
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/gtk/app/gtksys.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/x11/x11sys.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx index a5b134e420f2..98c012ad5135 100644 --- a/vcl/unx/gtk/app/gtksys.cxx +++ b/vcl/unx/gtk/app/gtksys.cxx @@ -104,9 +104,9 @@ unsigned int GtkSalSystem::GetDisplayScreenCount() return G_MAXINT - nMonitor; } -bool GtkSalSystem::IsMultiDisplay() +bool GtkSalSystem::IsUnifiedDisplay() { - return gdk_display_get_n_screens (mpDisplay) > 1; + return gdk_display_get_n_screens (mpDisplay) == 1; } namespace { diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx index 522aeecfae85..c2c7388cdef7 100644 --- a/vcl/unx/x11/x11sys.cxx +++ b/vcl/unx/x11/x11sys.cxx @@ -60,11 +60,11 @@ unsigned int X11SalSystem::GetDisplayScreenCount() return pSalDisp->IsXinerama() ? pSalDisp->GetXineramaScreens().size() : pSalDisp->GetScreenCount(); } -bool X11SalSystem::IsMultiDisplay() +bool X11SalSystem::IsUnifiedDisplay() { SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay(); unsigned int nScreenCount = pSalDisp->GetScreenCount(); - return pSalDisp->IsXinerama() ? false : (nScreenCount > 1); + return pSalDisp->IsXinerama() ? true : (nScreenCount == 1); } unsigned int X11SalSystem::GetDefaultDisplayNumber() |