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

Merge pull request #2131 from atom/cursors

Browse source 
win: Build with cursors from Chromium
This commit is contained in:
Cheng Zhao 2015-07-06 15:49:11 +08:00
commit 99e8238f90
4 changed files with 56 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom.gyp
View file

@ -116,6 +116,9 @@
], ],
}], # OS!="mac" }], # OS!="mac"
['OS=="win"', { ['OS=="win"', {
'include_dirs': [
'<(libchromiumcontent_dir)/gen/ui/resources',
],
'copies': [ 'copies': [
{ {
'variables': { 'variables': {

31
atom/browser/resources/win/atom.rc
View file

@ -1,6 +1,12 @@
// Microsoft Visual C++ generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "grit\\ui_unscaled_resources.h"
#include "resource.h" #include "resource.h"
#include <winresrc.h>
#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC (-1)
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -106,3 +112,28 @@ END
IDR_MAINFRAME ICON "atom.ico" IDR_MAINFRAME ICON "atom.ico"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
//
// Cursors
//
IDC_ALIAS CURSOR "ui\\resources\\cursors\\aliasb.cur"
IDC_CELL CURSOR "ui\\resources\\cursors\\cell.cur"
IDC_COLRESIZE CURSOR "ui\\resources\\cursors\\col_resize.cur"
IDC_COPYCUR CURSOR "ui\\resources\\cursors\\copy.cur"
IDC_CURSOR_NONE CURSOR "ui\\resources\\cursors\\none.cur"
IDC_HAND_GRAB CURSOR "ui\\resources\\cursors\\hand_grab.cur"
IDC_HAND_GRABBING CURSOR "ui\\resources\\cursors\\hand_grabbing.cur"
IDC_PAN_EAST CURSOR "ui\\resources\\cursors\\pan_east.cur"
IDC_PAN_MIDDLE CURSOR "ui\\resources\\cursors\\pan_middle.cur"
IDC_PAN_NORTH CURSOR "ui\\resources\\cursors\\pan_north.cur"
IDC_PAN_NORTH_EAST CURSOR "ui\\resources\\cursors\\pan_north_east.cur"
IDC_PAN_NORTH_WEST CURSOR "ui\\resources\\cursors\\pan_north_west.cur"
IDC_PAN_SOUTH CURSOR "ui\\resources\\cursors\\pan_south.cur"
IDC_PAN_SOUTH_EAST CURSOR "ui\\resources\\cursors\\pan_south_east.cur"
IDC_PAN_SOUTH_WEST CURSOR "ui\\resources\\cursors\\pan_south_west.cur"
IDC_PAN_WEST CURSOR "ui\\resources\\cursors\\pan_west.cur"
IDC_ROWRESIZE CURSOR "ui\\resources\\cursors\\row_resize.cur"
IDC_VERTICALTEXT CURSOR "ui\\resources\\cursors\\vertical_text.cur"
IDC_ZOOMIN CURSOR "ui\\resources\\cursors\\zoom_in.cur"
IDC_ZOOMOUT CURSOR "ui\\resources\\cursors\\zoom_out.cur"
/////////////////////////////////////////////////////////////////////////////

21
filenames.gypi
View file

@ -423,6 +423,27 @@
'atom/browser/resources/win/atom.ico', 'atom/browser/resources/win/atom.ico',
'atom/browser/resources/win/atom.rc', 'atom/browser/resources/win/atom.rc',
'<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc', '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc',
# Cursors.
'<(libchromiumcontent_src_dir)/ui/resources/cursors/aliasb.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/cell.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/col_resize.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/copy.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/hand_grab.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/hand_grabbing.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/none.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_east.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_middle.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north_east.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_north_west.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south_east.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_south_west.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/pan_west.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/row_resize.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/vertical_text.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_in.cur',
'<(libchromiumcontent_src_dir)/ui/resources/cursors/zoom_out.cur',
], ],
}], # OS=="win" }], # OS=="win"
], ],

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 706799700b6cbdd8c6657e7253f0395b38412d57 Subproject commit 74d22719998de8c5b204fbc3fb564f91c20ef8cb