jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing changes for window implementation

Browse source
This commit is contained in:
Simon Fels 2016-11-25 08:51:38 +01:00
commit 161099057b
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/anbox/ubuntu/window.cpp
View file

@ -35,9 +35,10 @@ Window::Observer::~Observer() {
} }
Window::Window(const Id &id, Window::Window(const Id &id,
const wm::Task::Id &task,
const std::shared_ptr<Observer> &observer, const std::shared_ptr<Observer> &observer,
const wm::WindowState &state) : const graphics::Rect &frame) :
wm::Window(state), wm::Window(task, frame),
id_(id), id_(id),
observer_(observer), observer_(observer),
native_display_(0), native_display_(0),
@ -46,10 +47,10 @@ Window::Window(const Id &id,
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
window_ = SDL_CreateWindow(default_window_name, window_ = SDL_CreateWindow(default_window_name,
state.frame().left(), frame.left(),
state.frame().top(), frame.top(),
state.frame().width(), frame.width(),
state.frame().height(), frame.height(),
SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS); SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS);
if (!window_) { if (!window_) {
const auto message = utils::string_format("Failed to create window: %s", SDL_GetError()); const auto message = utils::string_format("Failed to create window: %s", SDL_GetError());
@ -78,7 +79,7 @@ Window::Window(const Id &id,
} }
Window::Window(int x, int y, int width, int height) : Window::Window(int x, int y, int width, int height) :
wm::Window(wm::WindowState()), wm::Window(0, graphics::Rect{x,y,x + width,y + height}),
native_display_(0), native_display_(0),
native_window_(0) { native_window_(0) {
@ -123,7 +124,7 @@ void Window::resize(int width, int height) {
SDL_SetWindowSize(window_, width, height); SDL_SetWindowSize(window_, width, height);
} }
int Window::update_position(int x, int y) { void Window::update_position(int x, int y) {
SDL_SetWindowPosition(window_, x, y); SDL_SetWindowPosition(window_, x, y);
} }