bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix browser window position in cefclient when using integrated window menu bar (issue #1388). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1851 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-09-30 17:20:43 +00:00
parent 4fe21a31d8
commit 25ed4dfefc
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/cefclient/cefclient_gtk.cpp
View File

@ -38,6 +38,9 @@ char szWorkingDir[512]; // The current working directory
// Height of the buttons at the top of the GTK window. // Height of the buttons at the top of the GTK window.
int g_toolbar_height = 0; int g_toolbar_height = 0;
// Height of the integrated menu bar (if any) at the top of the GTK window.
int g_menubar_height = 0;
class MainBrowserProvider : public OSRBrowserProvider { class MainBrowserProvider : public OSRBrowserProvider {
virtual CefRefPtr<CefBrowser> GetBrowser() { virtual CefRefPtr<CefBrowser> GetBrowser() {
if (g_handler.get()) if (g_handler.get())
@ -89,9 +92,9 @@ void TerminationSignalHandler(int signatl) {
AppQuitMessageLoop(); AppQuitMessageLoop();
} }
void VboxSizeAllocated(GtkWidget *widget, void VboxSizeAllocated(GtkWidget* widget,
GtkAllocation *allocation, GtkAllocation* allocation,
void *data) { void* data) {
if (g_handler) { if (g_handler) {
CefRefPtr<CefBrowser> browser = g_handler->GetBrowser(); CefRefPtr<CefBrowser> browser = g_handler->GetBrowser();
if (browser && !browser->GetHost()->IsWindowRenderingDisabled()) { if (browser && !browser->GetHost()->IsWindowRenderingDisabled()) {
@ -100,18 +103,26 @@ void VboxSizeAllocated(GtkWidget *widget,
::Window xwindow = browser->GetHost()->GetWindowHandle(); ::Window xwindow = browser->GetHost()->GetWindowHandle();
XWindowChanges changes = {0}; XWindowChanges changes = {0};
changes.width = allocation->width; changes.width = allocation->width;
changes.height = allocation->height - g_toolbar_height; changes.height = allocation->height -
XConfigureWindow(xdisplay, xwindow, CWHeight | CWWidth, &changes); (g_toolbar_height + g_menubar_height);
changes.y = g_toolbar_height + g_menubar_height;
XConfigureWindow(xdisplay, xwindow, CWHeight | CWWidth | CWY, &changes);
} }
} }
} }
void ToolbarSizeAllocated(GtkWidget *widget, void ToolbarSizeAllocated(GtkWidget* widget,
GtkAllocation *allocation, GtkAllocation* allocation,
void *data) { void* data) {
g_toolbar_height = allocation->height; g_toolbar_height = allocation->height;
} }
void MenubarSizeAllocated(GtkWidget* widget,
GtkAllocation* allocation,
void* data) {
g_menubar_height = allocation->height;
}
gboolean WindowFocusIn(GtkWidget* widget, gboolean WindowFocusIn(GtkWidget* widget,
GdkEventFocus* event, GdkEventFocus* event,
gpointer user_data) { gpointer user_data) {
@ -450,6 +461,8 @@ int main(int argc, char* argv[]) {
gtk_container_add(GTK_CONTAINER(window), vbox); gtk_container_add(GTK_CONTAINER(window), vbox);
GtkWidget* menu_bar = CreateMenuBar(); GtkWidget* menu_bar = CreateMenuBar();
g_signal_connect(menu_bar, "size-allocate",
G_CALLBACK(MenubarSizeAllocated), NULL);
gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 0);