ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing set_bordered name.

This commit is contained in:
Ben Vanik 2015-09-07 09:08:19 -07:00
parent 2b30ac393d
commit 855ab7c040
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/ui/window.h
View File

@ -54,7 +54,7 @@ class Window {
virtual void ToggleFullscreen(bool fullscreen) {} virtual void ToggleFullscreen(bool fullscreen) {}
virtual bool is_bordered() const { return false; } virtual bool is_bordered() const { return false; }
virtual void SetBordered(bool enabled) {} virtual void set_bordered(bool enabled) {}
bool has_focus() const { return has_focus_; } bool has_focus() const { return has_focus_; }
virtual void set_focus(bool value) { has_focus_ = value; } virtual void set_focus(bool value) { has_focus_ = value; }

2
src/xenia/ui/window_win.cc
View File

@ -196,7 +196,7 @@ bool Win32Window::is_bordered() const {
return (style & WS_OVERLAPPEDWINDOW) == WS_OVERLAPPEDWINDOW; return (style & WS_OVERLAPPEDWINDOW) == WS_OVERLAPPEDWINDOW;
} }
void Win32Window::SetBordered(bool enabled) { void Win32Window::set_bordered(bool enabled) {
if (is_fullscreen()) { if (is_fullscreen()) {
// Don't screw with the borders if we're fullscreen. // Don't screw with the borders if we're fullscreen.
return; return;

4
src/xenia/ui/window_win.h
View File

@ -35,7 +35,7 @@ class Win32Window : public Window {
void ToggleFullscreen(bool fullscreen) override; void ToggleFullscreen(bool fullscreen) override;
bool is_bordered() const override; bool is_bordered() const override;
void SetBordered(bool enabled) override; void set_bordered(bool enabled) override;
void set_cursor_visible(bool value) override; void set_cursor_visible(bool value) override;
void set_focus(bool value) override; void set_focus(bool value) override;
@ -70,7 +70,7 @@ class Win32Window : public Window {
bool closing_ = false; bool closing_ = false;
bool fullscreen_ = false; bool fullscreen_ = false;
WINDOWPLACEMENT windowed_pos_; WINDOWPLACEMENT windowed_pos_ = {0};
}; };
class Win32MenuItem : public MenuItem { class Win32MenuItem : public MenuItem {