mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Support JavaScript window.moveTo/By() and resizeTo/By() (fixes #698)
Adds new CefDisplayHandler::OnContentsBoundsChange and CefDisplayHandler::GetRootWindowScreenRect callbacks. cefclient: Implement the above callbacks and call CefBrowserHost::NotifyScreenInfoChanged when the root window bounds change. cefclient: osr: Use real screen bounds by default. Pass `--fake-screen-bounds` for the old default behavior. Load https://tests/window in cefclient for additional implementation details and usage examples.
This commit is contained in:
@ -29,113 +29,32 @@ GtkWindow* GetWindow(CefRefPtr<CefBrowser> browser) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool IsMaximized(GtkWindow* window) {
|
||||
GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
|
||||
gint state = gdk_window_get_state(gdk_window);
|
||||
return (state & GDK_WINDOW_STATE_MAXIMIZED) ? true : false;
|
||||
}
|
||||
|
||||
void SetPosImpl(CefRefPtr<CefBrowser> browser,
|
||||
int x,
|
||||
int y,
|
||||
int width,
|
||||
int height) {
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
|
||||
GtkWindow* window = GetWindow(browser);
|
||||
if (!window) {
|
||||
return;
|
||||
}
|
||||
GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
|
||||
|
||||
// Make sure the window isn't minimized or maximized.
|
||||
if (IsMaximized(window)) {
|
||||
gtk_window_unmaximize(window);
|
||||
} else {
|
||||
gtk_window_present(window);
|
||||
}
|
||||
|
||||
// Retrieve information about the display that contains the window.
|
||||
GdkScreen* screen = gdk_screen_get_default();
|
||||
gint monitor = gdk_screen_get_monitor_at_window(screen, gdk_window);
|
||||
GdkRectangle rect;
|
||||
gdk_screen_get_monitor_geometry(screen, monitor, &rect);
|
||||
|
||||
// Make sure the window is inside the display.
|
||||
CefRect display_rect(rect.x, rect.y, rect.width, rect.height);
|
||||
CefRect window_rect(x, y, width, height);
|
||||
WindowTestRunner::ModifyBounds(display_rect, window_rect);
|
||||
|
||||
gdk_window_move_resize(gdk_window, window_rect.x, window_rect.y,
|
||||
window_rect.width, window_rect.height);
|
||||
}
|
||||
|
||||
void MinimizeImpl(CefRefPtr<CefBrowser> browser) {
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
|
||||
GtkWindow* window = GetWindow(browser);
|
||||
if (!window) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Unmaximize the window before minimizing so restore behaves correctly.
|
||||
if (IsMaximized(window)) {
|
||||
gtk_window_unmaximize(window);
|
||||
}
|
||||
|
||||
gtk_window_iconify(window);
|
||||
}
|
||||
|
||||
void MaximizeImpl(CefRefPtr<CefBrowser> browser) {
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
|
||||
GtkWindow* window = GetWindow(browser);
|
||||
if (!window) {
|
||||
return;
|
||||
}
|
||||
gtk_window_maximize(window);
|
||||
}
|
||||
|
||||
void RestoreImpl(CefRefPtr<CefBrowser> browser) {
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
|
||||
GtkWindow* window = GetWindow(browser);
|
||||
if (!window) {
|
||||
return;
|
||||
}
|
||||
if (IsMaximized(window)) {
|
||||
gtk_window_unmaximize(window);
|
||||
} else {
|
||||
gtk_window_present(window);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
WindowTestRunnerGtk::WindowTestRunnerGtk() {}
|
||||
|
||||
void WindowTestRunnerGtk::SetPos(CefRefPtr<CefBrowser> browser,
|
||||
int x,
|
||||
int y,
|
||||
int width,
|
||||
int height) {
|
||||
MAIN_POST_CLOSURE(base::BindOnce(SetPosImpl, browser, x, y, width, height));
|
||||
}
|
||||
WindowTestRunnerGtk::WindowTestRunnerGtk() = default;
|
||||
|
||||
void WindowTestRunnerGtk::Minimize(CefRefPtr<CefBrowser> browser) {
|
||||
MAIN_POST_CLOSURE(base::BindOnce(MinimizeImpl, browser));
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
if (auto* window = GetWindow(browser)) {
|
||||
MinimizeWindow(window);
|
||||
}
|
||||
}
|
||||
|
||||
void WindowTestRunnerGtk::Maximize(CefRefPtr<CefBrowser> browser) {
|
||||
MAIN_POST_CLOSURE(base::BindOnce(MaximizeImpl, browser));
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
if (auto* window = GetWindow(browser)) {
|
||||
MaximizeWindow(window);
|
||||
}
|
||||
}
|
||||
|
||||
void WindowTestRunnerGtk::Restore(CefRefPtr<CefBrowser> browser) {
|
||||
MAIN_POST_CLOSURE(base::BindOnce(RestoreImpl, browser));
|
||||
REQUIRE_MAIN_THREAD();
|
||||
ScopedGdkThreadsEnter scoped_gdk_threads;
|
||||
if (auto* window = GetWindow(browser)) {
|
||||
RestoreWindow(window);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace window_test
|
||||
|
Reference in New Issue
Block a user