Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 969 vs 970 for /trunk/Source Code/Platform/Headers/DisplayWindow.h

Diff revisions: vs.
  @@ -151,6 +151,10 @@
151 151 void opacity(U8 opacity);
152 152 inline U8 opacity() const;
153 153
154 + inline void clearColour(const vec4<F32>& colour);
155 + inline vec4<F32>& clearColour();
156 + inline const vec4<F32>& clearColour() const;
157 +
154 158 void setDimensions(U16 dimensionX, U16 dimensionY);
155 159 void setDimensions(const vec2<U16>& dimensions);
156 160
  @@ -181,6 +185,8 @@
181 185 void handleEvent(SDL_Event event);
182 186 void notifyListeners(WindowEvent event, const WindowEventArgs& args);
183 187
188 + inline void destroyCbk(const DELEGATE_CBK<void>& destroyCbk);
189 +
184 190 private:
185 191 void restore();
186 192 /// Internally change window size
  @@ -224,8 +230,7 @@
224 230 WindowType _previousType;
225 231 WindowType _queuedType;
226 232 bool _swapBuffers;
227 - /// this is false if the window/application lost focus (e.g. clicked another
228 - /// window, alt + tab, etc)
233 + /// this is false if the window/application lost focus (e.g. clicked another window, alt + tab, etc)
229 234 bool _hasFocus;
230 235 bool _minimized;
231 236 bool _maximized;
  @@ -241,12 +246,15 @@
241 246 vec2<U16> _prevDimensions;
242 247 vec2<U16> _windowDimensions;
243 248 vec2<U16> _windowDrawableArea;
244 -
249 + vec4<F32> _clearColour;
245 250 typedef vectorImpl<EventListener> EventListeners;
246 251 std::array<EventListeners, to_base(WindowEvent::COUNT)> _eventListeners;
247 252
248 253 std::unique_ptr<Input::InputInterface> _inputHandler;
249 254 Uint32 _windowID;
255 +
256 + DELEGATE_CBK<void> _destroyCbk;
257 +
250 258 // Varies from OS to OS
251 259 WindowHandle _handle;
252 260