mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
13749 commits 1 branch 183 tags 5.3 GiB
Commit graph

340 commits

Author SHA1 Message Date
Cheng Zhao
06d2dfe119 Merge pull request #6788 from electron/felix-progress-enum 
Use enum to declare ProgressState
 2016-08-18 14:35:00 +09:00
Kevin Sawicki
86e5bd3552 Disable resize during any stylemask change 2016-08-15 13:18:22 -07:00
Milan Burda
ab8fd49c72 Add support for titleBarStyle: 'hidden' on OS X 10.9 (hidden-inset falls back to hidden) 2016-08-15 22:10:38 +02:00
Felix Rieseberg
8b85ee8a20 🔧 Use enum to declare ProgressState 
As recommended in #6768, this commit adds an enum for progress states for windows.
 2016-08-10 08:56:26 -07:00
Cheng Zhao
81244c2221 Merge pull request #6768 from electron/felix-set-progress 
Enable mode indication for setProgressBar
 2016-08-09 20:58:07 +09:00
Felix Rieseberg
73c91dae9e 🔧 Enable mode indication for setProgressBar 
This commit enables setting a mode for the setProgressBar method.
Old behavior is kept intact, usage is entirely optional.
 2016-08-08 15:52:20 -07:00
Cheng Zhao
f5abae31a3 Code cleanup for native_window_mac 
Method definitions should matche sequence of declarations.
 2016-08-08 20:15:45 +09:00
Anthony Tseng
1aedccaeeb Fix scroll conflict 2016-08-06 14:02:40 +08:00
Cheng Zhao
3be68ba136 Merge pull request #6736 from electron/maximizable-state 
Always restore maximizable state after changing window behavior/style
 2016-08-05 17:25:22 +09:00
Kevin Sawicki
b77a553de7 Always reset maximizable state 2016-08-04 16:50:22 -07:00
Kevin Sawicki
52199a008d Add initial setContentBounds method 2016-08-04 12:02:24 -07:00
Kevin Sawicki
a190495df3 Use bounds for converting window/content sizes 2016-08-04 11:27:27 -07:00
Kevin Sawicki
48cc13d009 Add BrowserWindow.getClientBounds API 2016-08-04 09:58:35 -07:00
gellert
0bb5dabf99 omits setMouseDownCanMoveWindow call for OffScreenView 2016-08-04 12:00:35 +02:00
Cheng Zhao
3335792200 Remove some unneeded hacks for old OS X versions 2016-07-12 15:15:47 +09:00
Cheng Zhao
2ee8142136 Fix transparent window having border on OS X 10.9 2016-07-12 15:01:37 +09:00
Cheng Zhao
31e67788a2 mac: Do not change window size when in fullscreen 2016-07-11 16:44:42 +09:00
Cheng Zhao
381366daf1 Fix indention 2016-07-11 16:43:01 +09:00
Cheng Zhao
db8787fce1 The fullscreen button should always be hidden for frameless window 2016-07-11 16:00:29 +09:00
Cheng Zhao
7848608198 Replace DialogScope with UnresponsiveSuppressor 
The latter is global-wide.
 2016-07-11 15:29:03 +09:00
Cheng Zhao
d23c1bf917 Cleanup the code of SetBounds 2016-07-07 20:02:18 +09:00
Samuel Attard
ceb2864881 Move size bounding logic to SetBounds 2016-07-07 20:55:10 +12:00
Samuel Attard
6bd343b112 Bound the target width and height of window when calling SetSize 2016-07-07 00:49:35 +12:00
Cheng Zhao
7f3a296050 mac: Avoid calling setTitleVisibility for OS X 10.9 2016-06-23 13:00:14 +09:00
Milan Burda
c243cf0c0f Add BrowserWindow.prototype.setContentProtection(enable) 2016-06-22 10:40:33 +02:00
Cheng Zhao
8ffd069689 mac: Fix maximize/unmaximize event emitted before window is maximized 2016-06-22 14:06:54 +09:00
Cheng Zhao
5674e8d114 Only define enable/disable API for views 2016-06-20 15:44:50 +09:00
Cheng Zhao
e33e4be257 macOS: Use sheet window as modal window 2016-06-20 14:49:24 +09:00
Cheng Zhao
1866dbe608 Move disable counter to NativeWindow from api::Window 2016-06-20 11:48:46 +09:00
Cheng Zhao
f4bec78ccb linux: Implement win.setParentWindow(parent) 2016-06-20 11:16:41 +09:00
Cheng Zhao
85ba382027 Add "parent" option for BrowserWindow 2016-06-20 11:16:41 +09:00
Cheng Zhao
f2cbd7cb36 mac: Add win.beginSheet(sheet)/endSheet(sheet) API 2016-06-20 11:16:41 +09:00
Cheng Zhao
1a4b4a65c9 mac: Add win.disable/enable/isEnabled() API 2016-06-20 11:16:41 +09:00
Cheng Zhao
fb7e7b315c mac: Close all child windows before closing current window 2016-06-20 11:16:41 +09:00
Cheng Zhao
fd42e3dc84 mac: Add win.setParentWindow(parent) API 2016-06-20 11:16:41 +09:00
Cheng Zhao
6f4899bd94 Merge pull request #6068 from electron/redispatch-events 
Redispatch events to handle native OSX shortcuts
 2016-06-19 11:22:02 +00:00
Leonard Lamprecht
67dd19ed0f Replace OS X and Mac OS with macOS 2016-06-18 15:26:26 +02:00
Kevin Sawicki
0e65977a3c Use EventDispatchingWindow from brightray 2016-06-17 11:11:50 -07:00
Kevin Sawicki
1762599df0 Remove unused variable 2016-06-17 09:12:59 -07:00
Kevin Sawicki
a2bbfea9e0 Redispatch events to handle native shortcuts 2016-06-17 09:12:59 -07:00
Cheng Zhao
57ed682e34 Merge pull request #6091 from electron/icon-progress-crash 
Fix crash setting progress after setting dock icon
 2016-06-17 03:29:49 +00:00
Cheng Zhao
6b20d6c189 Don't change the behavior of transparent window 2016-06-17 11:02:37 +09:00
Cheng Zhao
9eea973d31 Use the setTitleVisibility to control tittlebar's visibility 2016-06-17 10:54:50 +09:00
Kevin Sawicki
5f0238ebf4 Add subview whenever content view is empty 2016-06-16 14:57:23 -07:00
bridiver
2094b39460 set the title for hidden and hidden-inset windows so they show up in the window menu list 
fixes #6088
 2016-06-16 13:12:53 -07:00
Cheng Zhao
8eca728e0a Add focusable option 2016-06-13 17:10:28 +09:00
Milan Burda
7a1d1ee0ea Add BrowserWindow.prototype.setIgnoreFocus 2016-06-12 20:20:57 +02:00
Kevin Sawicki
9f93f4e27f Set maximizable state after installing view 2016-06-08 13:56:45 -07:00
Kevin Sawicki
70996c79ba Add showDefinitionForSelection webContents proxy method 2016-06-08 10:19:43 -07:00
Kevin Sawicki
6360a5cae4 Add deprecation TODO for BrowserWindow.showDefinitionForSelection 2016-06-08 10:15:36 -07:00
Cheng Zhao
b444211d6f Fix title of frameless window showing as empty under fullscreen 2016-06-07 17:26:26 +09:00
Cheng Zhao
a176aaee01 Merge pull request #5734 from danhp/fix-aspect-ratio 
Fix 'setAspectRatio(0)' not resetting the default behaviour.
 2016-05-30 01:14:03 +00:00
Kevin Sawicki
b465f2c3c4 Remove duplicate hidden-inset check 2016-05-27 13:27:35 -07:00
Daniel Pham
0c710fce33 🍎 Fix 'setAspectRatio(0)' not resetting the default behaviour. 2016-05-27 08:56:34 -04:00
Daniel Pham
d1c302800f Fix: Properly notify observers when window prevents close 2016-05-25 19:26:57 -04:00
Cheng Zhao
9f858e1243 Merge branch 'master' into chrome51 2016-05-23 19:49:43 +09:00
Cheng Zhao
1b9bced8c0 Merge pull request #5644 from leethomas/fix/osx-aspect-ratio 
🍎  let Cocoa handle keeping aspect ratio on window resize
 2016-05-23 08:15:44 +00:00
leethomas
de27b34891 disregard extraSize when initially setting the aspect ratio 2016-05-22 19:09:21 -07:00
Cheng Zhao
7ba391da7c Update to API changes of Chrome 51 2016-05-23 10:59:39 +09:00
leethomas
1d61f987cb code styling 2016-05-22 18:59:00 -07:00
leethomas
09de0c2766 call base SetAspectRatio in NativeWindowMac implementation 2016-05-22 17:22:57 -07:00
leethomas
ac6e4aff5e comments 2016-05-22 17:00:14 -07:00
leethomas
7aaf974362 override SetAspectRatio for NativeWindowMac 2016-05-22 16:50:50 -07:00
leethomas
8f7a04f9c3 🍎 let Cocoa handle keeping the aspect ratio whenever the edges are dragged 2016-05-22 15:43:47 -07:00
leethomas
359123458d 🍎 allow x-axis offset to be set for sheets 2016-05-18 23:45:54 -07:00
Cheng Zhao
5f6c468f0f Handle keyboard events for WebContents that do not have owner window 2016-05-18 13:57:48 +09:00
Cheng Zhao
13bfb099a2 Fix the toolbar showing when titleBarStyle is hidden-inset 2016-05-17 16:25:18 +09:00
Cheng Zhao
f53aabaef5 Implement titleBarStyle without using NSFullSizeContentViewWindowMask 2016-05-17 15:48:14 +09:00
Milan Burda
e1516d4244 Fix BrowserWindow.maximize/unmaximize on Mac 2016-04-23 01:16:31 +02:00
Cheng Zhao
18f5fcde60 Fix some coding style issues 2016-04-20 09:18:50 +09:00
Ben Gotow
65c37fe64b Create local variable to typecast view 2016-04-16 10:57:39 -04:00
Ben Gotow
c87c49f4c8 Allow sheets to be attached at a custom offset #4679 
Adds a new "setSheetOffset" API to the `dialog` module, which allows you to change the attachment point for sheets on Mac OS X. I put the API on the dialog module, even though Mac OS X requires that the native window hold and return the desired offset.

1. I was originally hoping to make this an argument on the actual dialog.show* calls, but it seems the parameter set is defined in `libchromiumcontent` and I wasn't sure it would be appropriate to add there?

2.  The API could also be on the BrowserWindow (eg `BrowserWindow.setSheetOffset`). I don't have a strong preference, but I think it's more discoverable on the `dialog` module.
 2016-04-16 10:16:43 -04:00
Cheng Zhao
b84a178ceb Set the backgroundColor of RenderWidgetHostView 2016-04-14 21:52:17 +09:00
Cheng Zhao
f94661547c mac: backgroundColor should not change titlebar color 2016-04-03 11:59:21 +09:00
Cheng Zhao
1980d85f3e Fix converting SkColor to NSColor 
Close #4992.
 2016-04-02 21:18:15 +09:00
Cheng Zhao
cb470cb94b Use BrowserWindow's backgroundColor as renderer view's background color 2016-04-02 20:46:50 +09:00
James Wheare
8482109dea Switch to a single OS X swipe event with a direction argument 2016-03-23 15:20:11 +00:00
James Wheare
03319a5426 OSX: Capture 3-finger swipe events in NativeWindow 2016-03-18 15:21:19 +00:00
Arek Sredzki
fcc1f4d7ed Finalized browser-window show & hide events, added tests & fixed os x implementation 2016-03-10 13:51:31 -08:00
Cheng Zhao
2a0be28111 Merge pull request #4682 from phamdaniel/ismaximized 
Fix `isMaximized()` in window for when resizable is set to false on OSX
 2016-03-06 19:23:46 +09:00
Cheng Zhao
d93ccd47a8 Merge pull request #4670 from atom/cmd-backtick-order 
Use sendAction for cycling windows
 2016-03-06 16:17:38 +09:00
Cheng Zhao
114801d412 Remove the duplicate logic on OS X 2016-03-05 21:54:41 +09:00
Daniel Pham
d5f5cdb45a 🍎Fix 'isMaximized()' for non resizable windows 2016-03-05 01:39:48 -05:00
Kevin Sawicki
be67dca686 Use _cycleWindows selector to implement cmd-` 2016-03-03 20:53:58 -08:00
Cheng Zhao
12569f2c9d mac: Simulate the behavior of cmd+~ when OS X didn't handle it 2016-02-18 18:32:13 +08:00
Cheng Zhao
a83aee90e5 No need to use scoped_nsobject for id 2016-01-25 15:15:58 +08:00
Cheng Zhao
059d97e1aa Merge pull request #4181 from bengotow/scroll-touch-events 
Extend NativeWindow to track touch-based scroll events on OS X
 2016-01-25 14:47:54 +08:00
Cheng Zhao
7761815339 Merge branch 'bg-color-pr' of https://github.com/evgenyzinoviev/electron 2016-01-24 21:33:53 +08:00
Cheng Zhao
c41de501cb spec: Test the -able methods 2016-01-24 14:31:37 +08:00
Cheng Zhao
010cc3276a Simplify the setStyleMask calls 2016-01-24 14:31:37 +08:00
Cheng Zhao
239bfe970c Make hasShadow work on Windows/Linux 2016-01-24 14:31:37 +08:00
Cheng Zhao
d704b3f7ba Reorgnize how attributes work 2016-01-24 14:31:37 +08:00
Cheng Zhao
ae7e96f181 Fix fullscreenable on EL Capitan 2016-01-24 14:31:36 +08:00
Cheng Zhao
5372b6cd91 Fullscreenable => FullScreenable 2016-01-24 14:31:36 +08:00
Cheng Zhao
31624995bc Merge pull request #4202 from evgenyzinoviev/shadow-pr 
Added hasShadow option to BrowserWindow on OS X
 2016-01-22 23:56:38 -08:00
Cheng Zhao
8cabe0f008 Merge pull request #4156 from evgenyzinoviev/windows-pr 
Improvements in BrowserWindow
 2016-01-22 23:42:41 -08:00
evgenyzinoviev
ff41b4a267 added hasShadow option to BrowserWindow (osx) 2016-01-23 01:16:08 +01:00
evgenyzinoviev
2fcd3ce7cd Support alpha in backgroundColor 2016-01-23 00:55:08 +01:00
evgenyzinoviev
85991d312a mac: SetResizable fix 2016-01-22 23:44:17 +01:00
evgenyzinoviev
ef51e4e108 maximizable and fullscreenable 2016-01-22 23:21:46 +01:00
Ben Gotow
d186dceb4b Add correct window check for wheel events. See description 
Tested that with two windows, events are fired on the correct BrowserWindow instance and not both, and that scrolling a window which is in the background works properly.
 2016-01-21 16:36:48 -08:00
Ben Gotow
e96e674201 Properly clean up NSEvent monitor 2016-01-21 16:31:31 -08:00
Cheng Zhao
21f5e27a5e Merge pull request #4161 from gabriel/master 
Support backgroundColor for window on mac
 2016-01-21 15:42:21 -07:00
Gabriel Handford
239baa3e9a Support backgroundColor for window on mac 2016-01-21 11:07:33 -08:00
Ben Gotow
bd2252ea55 Extend NativeWindow to track touch-based scroll events on OS X 
In N1, we want to implement the famous "swipe to archive" action on threads in the user's inbox. Chrome exposes `scroll` and `wheel` events, but these aren't sufficient to implement the interaction because the element needs to "snap" when the user lifts their fingers from the trackpad, not when they / we stop receiving `wheel` / `scroll` events. These events may stop before the user lifts their fingers, or continue after the user has lifted their fingers if they had enough momentum for the gesture to continue.

This exposes BrowserWindow `scroll-touch-down` and `scroll-touch-up`, which fire immeditaely when the user touches two fingers to the trackpad, and again when the user lifts their fingers. Combined with the existing wheel event should allow for "swipe-to-archive" and other similar interactions.

Note: This is only implemented on Mac OS X and the events don't fire unless you're using a trackpad!

Related: #1486, #2683, https://github.com/nylas/N1/issues/541
 2016-01-21 09:40:21 -08:00
evgenyzinoviev
2a554cb138 added or/and improved closable, minimizable, movable, resizable features for windows on os x and windows 2016-01-19 16:14:57 +01:00
Cheng Zhao
712f11a9a3 Merge pull request #4112 from evgenyzinoviev/resize-animate-pr 
Animate window resizing on OS X
 2016-01-16 12:12:00 +08:00
evgenyzinoviev
b75dccb0be arguments handing rewritten, doc updated 2016-01-15 17:31:31 +01:00
evgenyzinoviev
2598b00b41 Animate window resizing on OS X 2016-01-15 05:59:58 +01:00
evgenyzinoviev
cda88db77c Added option to prevent a window from being moved on OS X 2016-01-15 03:58:57 +01:00
Omri Litov
943e46f3bd Fix linux and mac build errors 2016-01-08 00:27:53 +02:00
Omri Litov
3f0c007578 Added getNativeWindowHandle 2016-01-07 22:38:35 +02:00
Cheng Zhao
10f663d017 Fix hiding fullscreen button on EL Capitan 2016-01-07 15:46:40 +08:00
Cheng Zhao
e90435e236 Remove visual artifacts of hidden-inset window 2015-12-23 12:38:11 +08:00
jaanus
aa2f7aaf3a Fixes #2810: correct look of hidden-inset windows in full screen. 
`hidden` and `hidden-inset` windows differ only by the hidden-inset window having a toolbar. Yet, the toolbar yields an incorrect look in fullscreen mode. So, we hide and recreate the toolbar for such windows when going to/from fullscreen.

There are some visible artifacts during the fullscreen animations, as the toolbar gets created and destroyed. When entering fullscreen, you see a toolbar that then disappears. When going back to normal window, you see the traffic light buttons jump around a little bit. Yet, this is definitely better than the current broken fullscreen look.
 2015-12-22 20:31:55 +02:00
Cheng Zhao
774ba2a235 Merge pull request #3706 from billyct/master 
support an api with SetIgnoreMouseEvents for osx
 2015-12-09 12:00:16 +08:00
Cheng Zhao
0f2f9b5543 No need to use CommandDispatcher 2015-12-08 11:20:07 +08:00
Cheng Zhao
73e7773d84 Update to API changes of Chrome 47 2015-12-07 19:56:23 +08:00
billyct
5f092a6c65 support an api with SetIgnoreMouseEvents, and worked fine with osx 2015-12-06 10:14:54 +08:00
Cheng Zhao
6c1878d15b mac: Clears the delegate when window is going to be closed 
Since EL Capitan it is possible that the methods of delegate would get
called after the window has been closed.

Refs atom/atom#9584.
 2015-11-26 13:56:56 +08:00
Cheng Zhao
8e2faba8f7 Small style fix 2015-11-20 13:06:42 +08:00
Ben Gotow
d427ae1030 Support the "desktop" window type on Mac OS X 
Adds the desktop window type referenced in https://github.com/atom/electron/issues/2899 for compatiblity with the linux version. Note that on Mac OS X, the desktop window cannot receive input events (seems to be a limitation of being behind the desktop).

In this diff I also removed the `standardWindow` option from the docs, in favor of an additional `textured` value for window `type` on Mac OS X. The old `standardWindow` option continues to work, but seemed more confusing. If this seems like a bad idea, I can revert that change.
 2015-11-19 00:39:45 -08:00
Cheng Zhao
860c46b3c1 Separate options from switches 
On Windows the case sensitivity of command line switches are ignored, so
--nodeIntegraion will become --nodeintegration.

We should separate options from switches so we use "nodeIntegraion" in
options, while passing "--node-integration" in command line.
 2015-11-13 14:05:49 +08:00
Cheng Zhao
e36d455d51 Add setBackgroundColor method 2015-10-23 11:35:33 +08:00
Cheng Zhao
d092c6acc9 osx: Implement draggable region with mouseDownCanMoveWindow 
Previously we implemented draggable region by tracking mouse position,
it is buggy and causing some problems. But it is interesting that until
this didn't cause troubles until recently.
 2015-10-21 08:54:46 +08:00
Cheng Zhao
898db4d6bd osx: Set resizable flag when creating window 
Setting resizable for frameless window before it is shown will change
its size.
 2015-10-06 15:23:23 +08:00
Cheng Zhao
6fea6cf58a osx: Fix setting size constraints for frameless window 2015-10-06 15:15:23 +08:00
Cheng Zhao
d19ead1907 osx: Call setContentMinSize in SetContentSizeConstraints 2015-10-05 20:09:29 +08:00
Cheng Zhao
279407f7a3 osx: Fix converting size for frameless window 2015-10-05 20:07:20 +08:00
Cheng Zhao
8577f2b52f osx: Add NativeWindow::SetSizeConstraints 2015-10-05 20:07:20 +08:00
Cheng Zhao
8d61531f4e Revert #2879 2015-10-01 17:46:11 +08:00
Cheng Zhao
7884a2319c osx: Make draggable region work for window with hidden titlebar 2015-09-25 16:38:36 +08:00
Cheng Zhao
6f944ad49b Clean up code 2015-09-25 16:21:08 +08:00
Cheng Zhao
da57a3101f Call WasShown when showing window 
Otherwise WebContents would be invisible when window is hidden at first
and then show later.

Refs #2879.
 2015-09-24 18:16:41 +08:00
jaanus
5d8f1dd404 Implements #2734 “New API to configure BrowserWindow title bar on Mac” 
New API supported on Yosemite 10.10 and newer.
 2015-09-14 16:50:00 +02:00
Cheng Zhao
290b221d79 mac: Do not set rounded corner by adding layer 2015-08-26 15:58:44 +08:00
Cheng Zhao
1505dc207b mac: Disable resizing window when changing style mask 2015-08-05 14:12:55 +08:00
Cheng Zhao
58b1172025 Avoid exposing data members to subclass 2015-08-05 12:46:32 +08:00
Cheng Zhao
58c0486236 Remove duplicate UpdateDraggableRegions 2015-08-05 12:32:22 +08:00
Haojian Wu
c69002b0dd Fix: browser window will be resiable when calling window.setResizable(false) twice. 2015-07-31 09:57:08 +08:00
Cheng Zhao
df35700b94 Style fixes 
* Use under_score for variable names in C++
* Use const& when possible
* Line length <= 80
 2015-07-23 10:07:58 +08:00
Cheng Zhao
ea1b89c699 Merge pull request #2250 from EyeSee360/master 
Maintain an aspect ratio for content within a window
 2015-07-23 09:45:42 +08:00
Michael S. Barthelemy
6d25c81bd1 changes requested for pull request #2250 into electron master 2015-07-22 10:23:31 -04:00
Cheng Zhao
891d107a51 mac: Always use GetSize for frameless window 2015-07-21 10:34:37 +08:00
Cheng Zhao
3ea878941b mac: Always call SetSize for framless window 2015-07-21 10:29:05 +08:00
Michael S. Barthelemy
6656afd57f fix bug with computing the case where we should constrain via height 2015-07-17 10:25:30 -04:00
Michael S. Barthelemy
666aca7803 add function maintainAspectRatioOfInteriorContent to BrowserWindow in order to enforce an aspect ratio for an electron window 2015-07-16 13:54:51 -04:00
Cheng Zhao
9f52b11761 Remove NativeWindow::GetWebContents 2015-06-25 14:54:00 +08:00
Cheng Zhao
62c44ee47b Rename CloseWebContents to RequestToClosePage 2015-06-25 13:27:51 +08:00
Cheng Zhao
fb5fe7a714 Decouple WebContentsDelegate from NativeWindow 2015-06-25 11:07:23 +08:00