mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

gtk: Detect rare conditions when resizing.

Browse source
This commit is contained in:
Cheng Zhao 2014-03-27 21:03:27 +08:00
parent d3e6166de6
commit 5a837f5850
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_gtk.cc
View file

@ -7,10 +7,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/values.h"
#include "chrome/browser/ui/gtk/gtk_window_util.h"
#include "atom/common/draggable_region.h" #include "atom/common/draggable_region.h"
#include "atom/common/options_switches.h" #include "atom/common/options_switches.h"
#include "base/values.h"
#include "chrome/browser/ui/gtk/gtk_window_util.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h"
#include "content/public/common/renderer_preferences.h" #include "content/public/common/renderer_preferences.h"
@ -50,7 +50,7 @@ NativeWindowGtk::NativeWindowGtk(content::WebContents* web_contents,
int width = 800, height = 600; int width = 800, height = 600;
options->GetInteger(switches::kWidth, &width); options->GetInteger(switches::kWidth, &width);
options->GetInteger(switches::kHeight, &height); options->GetInteger(switches::kHeight, &height);
gtk_window_set_default_size(window_, width, height); SetSize(gfx::Size(width, height));
if (!icon_.IsEmpty()) if (!icon_.IsEmpty())
gtk_window_set_icon(window_, icon_.ToGdkPixbuf()); gtk_window_set_icon(window_, icon_.ToGdkPixbuf());
@ -101,7 +101,7 @@ void NativeWindowGtk::CloseImmediately() {
void NativeWindowGtk::Move(const gfx::Rect& pos) { void NativeWindowGtk::Move(const gfx::Rect& pos) {
gtk_window_move(window_, pos.x(), pos.y()); gtk_window_move(window_, pos.x(), pos.y());
gtk_window_resize(window_, pos.width(), pos.height()); SetSize(pos.size());
} }
void NativeWindowGtk::Focus(bool focus) { void NativeWindowGtk::Focus(bool focus) {
@ -162,7 +162,7 @@ bool NativeWindowGtk::IsFullscreen() {
} }
void NativeWindowGtk::SetSize(const gfx::Size& size) { void NativeWindowGtk::SetSize(const gfx::Size& size) {
gtk_window_resize(window_, size.width(), size.height()); gtk_window_util::SetWindowSize(window_, size);
} }
gfx::Size NativeWindowGtk::GetSize() { gfx::Size NativeWindowGtk::GetSize() {