Merged changes to DisplaySettings from Stephan Huber in prep for controlling the menu hiding behaviour under OSX.

Added new WindowSystemInterface::setDisplaySettings() method to provide a mechanism for passing settings onto the WindowSystemInterface so it can then set up the system appropriately.

Added assignment of the DisplaySettings to the WindowSystemInterface in Viewer/ComppsiteViewer::realize().
This commit is contained in:
Robert Osfield
2013-10-22 19:12:34 +00:00
parent b7b7186cf8
commit c45f3aa4fb
5 changed files with 74 additions and 15 deletions

View File

@@ -176,6 +176,10 @@ class OSG_EXPORT GraphicsContext : public Object
virtual void enumerateScreenSettings(const ScreenIdentifier& screenIdentifier, ScreenSettingsList & resolutionList) = 0;
virtual void setDisplaySettings(DisplaySettings*) {}
virtual osg::DisplaySettings* getDisplaySettings() const { return 0; }
virtual GraphicsContext* createGraphicsContext(Traits* traits) = 0;
virtual ~WindowingSystemInterface() {}
@@ -206,6 +210,7 @@ class OSG_EXPORT GraphicsContext : public Object
settings.refreshRate = refreshRate;
return setScreenSettings(screenIdentifier, settings);
}
};