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

win: Implement setContentSize API.

Browse source
This commit is contained in:
Cheng Zhao 2014-05-18 21:27:23 +08:00
parent 0b202a2df1
commit 8ae66cab9d
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/native_window_win.cc
View file

@ -203,6 +203,7 @@ NativeWindowWin::NativeWindowWin(content::WebContents* web_contents,
: NativeWindow(web_contents, options), : NativeWindow(web_contents, options),
window_(new views::Widget), window_(new views::Widget),
web_view_(new views::WebView(NULL)), web_view_(new views::WebView(NULL)),
use_content_size_(false),
resizable_(true) { resizable_(true) {
views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
params.delegate = this; params.delegate = this;
@ -216,18 +217,12 @@ NativeWindowWin::NativeWindowWin(content::WebContents* web_contents,
options->GetInteger(switches::kWidth, &width); options->GetInteger(switches::kWidth, &width);
options->GetInteger(switches::kHeight, &height); options->GetInteger(switches::kHeight, &height);
bool use_content_size = false;
options->GetBoolean(switches::kUseContentSize, &use_content_size);
if (has_frame_ && use_content_size) {
gfx::Size window = window_->GetWindowBoundsInScreen().size();
gfx::Size client = window_->GetClientAreaBoundsInScreen().size();
width += window.width() - client.width();
height += window.height() - client.height();
}
gfx::Size size(width, height); gfx::Size size(width, height);
window_->CenterWindow(size); options->GetBoolean(switches::kUseContentSize, &use_content_size_);
if (has_frame_ && use_content_size_)
ClientAreaSizeToWindowSize(&size);
window_->CenterWindow(size);
window_->UpdateWindowIcon(); window_->UpdateWindowIcon();
web_view_->SetWebContents(web_contents); web_view_->SetWebContents(web_contents);
@ -305,7 +300,9 @@ gfx::Size NativeWindowWin::GetSize() {
} }
void NativeWindowWin::SetContentSize(const gfx::Size& size) { void NativeWindowWin::SetContentSize(const gfx::Size& size) {
// FIXME gfx::Size resized(size);
ClientAreaSizeToWindowSize(&resized);
SetSize(resized);
} }
gfx::Size NativeWindowWin::GetContentSize() { gfx::Size NativeWindowWin::GetContentSize() {
@ -393,10 +390,12 @@ void NativeWindowWin::SetMenu(ui::MenuModel* menu_model) {
RegisterAccelerators(); RegisterAccelerators();
// Resize the window so SetMenu won't change client area size. // Resize the window so SetMenu won't change client area size.
if (use_content_size_) {
gfx::Size size = GetSize(); gfx::Size size = GetSize();
size.set_height(size.height() + GetSystemMetrics(SM_CYMENU)); size.set_height(size.height() + GetSystemMetrics(SM_CYMENU));
SetSize(size); SetSize(size);
} }
}
void NativeWindowWin::UpdateDraggableRegions( void NativeWindowWin::UpdateDraggableRegions(
const std::vector<DraggableRegion>& regions) { const std::vector<DraggableRegion>& regions) {
@ -514,6 +513,13 @@ views::NonClientFrameView* NativeWindowWin::CreateNonClientFrameView(
return new NativeWindowFramelessView(widget, this); return new NativeWindowFramelessView(widget, this);
} }
void NativeWindowWin::ClientAreaSizeToWindowSize(gfx::Size* size) {
gfx::Size window = window_->GetWindowBoundsInScreen().size();
gfx::Size client = window_->GetClientAreaBoundsInScreen().size();
size->set_width(size->width() + window.width() - client.width());
size->set_height(size->height() + window.height() - client.height());
}
void NativeWindowWin::OnViewWasResized() { void NativeWindowWin::OnViewWasResized() {
// Set the window shape of the RWHV. // Set the window shape of the RWHV.
gfx::Size sz = web_view_->size(); gfx::Size sz = web_view_->size();

4
atom/browser/native_window_win.h
View file

@ -115,6 +115,8 @@ class NativeWindowWin : public NativeWindow,
typedef struct { int position; ui::MenuModel* model; } MenuItem; typedef struct { int position; ui::MenuModel* model; } MenuItem;
typedef std::map<ui::Accelerator, MenuItem> AcceleratorTable; typedef std::map<ui::Accelerator, MenuItem> AcceleratorTable;
void ClientAreaSizeToWindowSize(gfx::Size* size);
void OnViewWasResized(); void OnViewWasResized();
// Register accelerators supported by the menu model. // Register accelerators supported by the menu model.
@ -131,6 +133,8 @@ class NativeWindowWin : public NativeWindow,
scoped_ptr<SkRegion> draggable_region_; scoped_ptr<SkRegion> draggable_region_;
bool use_content_size_;
bool resizable_; bool resizable_;
string16 title_; string16 title_;
gfx::Size minimum_size_; gfx::Size minimum_size_;