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

Fix some coding style issues

Browse source
This commit is contained in:
Cheng Zhao 2016-04-20 09:18:50 +09:00
parent eb9e0e5534
commit 18f5fcde60
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window.cc
View file

@ -54,6 +54,7 @@ NativeWindow::NativeWindow(
enable_larger_than_screen_(false), enable_larger_than_screen_(false),
is_closed_(false), is_closed_(false),
has_dialog_attached_(false), has_dialog_attached_(false),
sheet_offset_(0.0),
aspect_ratio_(0.0), aspect_ratio_(0.0),
inspectable_web_contents_(inspectable_web_contents), inspectable_web_contents_(inspectable_web_contents),
weak_factory_(this) { weak_factory_(this) {

6
atom/browser/native_window_mac.mm
View file

@ -243,13 +243,13 @@ bool ScopedDisableResize::disable_resize_ = false;
return NO; return NO;
} }
- (NSRect)window:(NSWindow *)window willPositionSheet:(NSWindow *)sheet usingRect:(NSRect)rect { - (NSRect)window:(NSWindow*)window
NSView * view = window.contentView; willPositionSheet:(NSWindow*)sheet usingRect:(NSRect)rect {
NSView* view = window.contentView;
rect.origin.y = view.frame.size.height - shell_->GetSheetOffset(); rect.origin.y = view.frame.size.height - shell_->GetSheetOffset();
return rect; return rect;
} }
@end @end
@interface AtomNSWindow : NSWindow { @interface AtomNSWindow : NSWindow {

1
atom/browser/net/atom_network_delegate.h
View file

@ -121,6 +121,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
std::map<uint64_t, net::CompletionCallback> callbacks_; std::map<uint64_t, net::CompletionCallback> callbacks_;
base::Lock lock_; base::Lock lock_;
// Client id for devtools network emulation. // Client id for devtools network emulation.
std::string client_id_; std::string client_id_;

1
docs/api/dialog.md
View file

@ -122,7 +122,6 @@ it is usually used to report errors in early stage of startup. If called
before the app `ready`event on Linux, the message will be emitted to stderr, before the app `ready`event on Linux, the message will be emitted to stderr,
and no GUI dialog will appear. and no GUI dialog will appear.
## Sheets ## Sheets
On Mac OS X, dialogs are presented as sheets attached to a window if you provide On Mac OS X, dialogs are presented as sheets attached to a window if you provide