Commit graph

1484 commits

Author SHA1 Message Date
Heilig Benedek
3dd3fd9200 Merge branch 'master' of https://github.com/brenca/electron
Conflicts:
	atom/browser/api/atom_api_window.h
	atom/browser/native_window.cc
2015-08-31 18:46:29 +02:00
Heilig Benedek
c59c0bd5b3 Mouse event handling and keyboard event handling (not totally working yet) 2015-08-31 18:32:33 +02:00
gellert
58081ca9e9 setOffscreenRender and api docs added 2015-08-29 00:45:00 +02:00
Heilig Benedek
e4c01f3187 Offscreen render support base 2015-08-27 11:22:39 +02:00
Paul Betts
0efdb448b6 Merge pull request #2509 from atom/fix-win-tray
Correct generation of GUID on Windows.
2015-08-17 09:02:21 -07:00
Haojian Wu
763dcc545d Correct generation of GUID on Windows. 2015-08-17 13:20:36 +08:00
Eran Tiktin
6f25996fa1 Fixed typo 2015-08-16 23:20:09 +03:00
Cheng Zhao
b4e836bf2e Bump v0.30.4 2015-08-10 16:50:48 +08:00
Cheng Zhao
140ba2858a Fix cpplint warnings 2015-08-10 15:37:03 +08:00
Cheng Zhao
3379641fe2 Force request context to initialize beforing incepting protocol 2015-08-10 15:31:29 +08:00
Cheng Zhao
0644129fbe Pass net::URLRequestContextGetter in scoped_refptr 2015-08-10 15:28:18 +08:00
Cheng Zhao
c295979270 BrowserContext::GetRequestContext can only be called on UI thread 2015-08-10 15:02:16 +08:00
Cheng Zhao
33eadad139 popContextMenu => popUpContextMenu 2015-08-10 13:00:15 +08:00
Cheng Zhao
225140bd64 win: Don't emit right-clicked event when there is menu attached 2015-08-10 12:52:55 +08:00
Cheng Zhao
58dee04d5c mac: Redraw icon when menu is closed 2015-08-10 12:52:35 +08:00
Cheng Zhao
4b9ff309ec Add our own MenuModel class 2015-08-10 12:39:05 +08:00
Cheng Zhao
a3f3a35fd1 mac: Don't emit "clicked" event if there is menu attached 2015-08-10 12:18:00 +08:00
Cheng Zhao
0bf5effe58 Bump v0.30.3 2015-08-07 22:04:59 +08:00
Cheng Zhao
1bb0dde360 Use WebScopedRunV8Script in converted C++ functions 2015-08-07 19:37:17 +08:00
Cheng Zhao
2ff104d012 Move callback converter from native mate to electron 2015-08-07 19:35:35 +08:00
Cheng Zhao
744059b8bd Check button size 2015-08-06 15:22:17 +08:00
Cheng Zhao
454085eb95 Fix cpplint warning 2015-08-06 13:07:39 +08:00
Cheng Zhao
6e75af5c0f Move SetOverlayIcon to TaskbarHost 2015-08-06 13:07:00 +08:00
Cheng Zhao
8da7803f3e Save the taskbar object 2015-08-06 12:58:40 +08:00
Cheng Zhao
2d6f8350cb Move SetProgressBar to TaskbarHost 2015-08-06 12:54:00 +08:00
Cheng Zhao
958658513c Refactor code in taskbarHost 2015-08-06 12:44:07 +08:00
Cheng Zhao
a28f70e85c Decouple TaskbarHost from NativeWindow 2015-08-06 11:10:34 +08:00
Cheng Zhao
8f8c3aef87 ThumbarHost => TaskbarHost 2015-08-06 10:30:22 +08:00
Cheng Zhao
39af10cc8d Move thumbar_host_ from TreeHost to NativeWindow 2015-08-06 10:25:50 +08:00
Cheng Zhao
d175a68586 Add MessageHandlerDelegate 2015-08-06 10:15:27 +08:00
Cheng Zhao
f740684f41 Merge pull request #2400 from atom/thumbar_button
Implement API for supporting thumbnail toolbars
2015-08-06 09:55:26 +08:00
Cheng Zhao
20a8e7838f Merge pull request #2424 from deepak1556/web_contents_patch
webcontents: minor patches
2015-08-06 09:52:16 +08:00
Haojian Wu
2f1cb8b52a Expose NativeWindow.setThumbarButtons API to all platforms. 2015-08-05 22:30:05 +08:00
Robo
0a7a4c0d0a webview: adding load-commit event 2015-08-05 19:22:30 +05:30
Haojian Wu
78eac4116c Polish thumbar code.
* Fix a memory leak in thumbar initialization.
* Check the number of thumbar buttons, should be <= 7.
* Correct to check thumbar button click event.
2015-08-05 19:38:12 +08:00
Cheng Zhao
1505dc207b mac: Disable resizing window when changing style mask 2015-08-05 14:12:55 +08:00
Haojian Wu
dfd076a3e5 Move atom_desktop_window_tree_host_win to atom/browser/ui/win directory. 2015-08-05 13:55:06 +08:00
Haojian Wu
54af048f04 win: Add BrowserWindow.setThumbarButtons API. 2015-08-05 13:55:02 +08:00
Cheng Zhao
488a69d461 Merge pull request #2419 from atom/clean-native-window
Clean up NativeWindow code
2015-08-05 13:28:09 +08:00
Cheng Zhao
bbd6c927b1 Remove a few unused headers 2015-08-05 13:18:41 +08:00
Cheng Zhao
adbb909b39 Move ShouldUseGlobalMenuBar to x_window_utils 2015-08-05 13:16:03 +08:00
Cheng Zhao
58b1172025 Avoid exposing data members to subclass 2015-08-05 12:46:32 +08:00
Cheng Zhao
438a5acc0f Use ranged for loop 2015-08-05 12:34:45 +08:00
Cheng Zhao
58c0486236 Remove duplicate UpdateDraggableRegions 2015-08-05 12:32:22 +08:00
Cheng Zhao
1c4f50b2df Merge pull request #2418 from deepak1556/content_tracing_api_patch
tracing: fix api and docs
2015-08-05 10:42:18 +08:00
Cheng Zhao
dc60bfa885 Merge pull request #2410 from atom/pop_context_menu_issue
Check context menu when calling popContextMenu API.
2015-08-05 10:04:26 +08:00
Robo
3b05b135a5 tracing: fix api and docs 2015-08-05 02:29:55 +05:30
Cheng Zhao
97c15c463e Merge pull request #2412 from atom/dialog-title
win: Use app name as default title of message box
2015-08-04 22:52:20 +08:00
Cheng Zhao
50f226e34e win: Use app name as default title of message box
TaskDialogIndirect doesn't allow empty name, if we set empty title
it will show "electron.exe" in title.
2015-08-04 21:57:00 +08:00
Haojian Wu
613e5c77ea Check context menu when calling popContextMenu API. 2015-08-04 19:45:44 +08:00