BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3886 from kepstin/flash-cursors

Browse Source 
New cursors for flash client
This commit is contained in:
Chad Pilkey 2017-05-02 16:21:44 -04:00 committed by GitHub
commit ad0cf319bc
7 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/ellipse.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 926 B

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/line.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 336 B

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/pencil.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 850 B

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/square.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 B

After

Width:  |  Height:  |  Size: 345 B

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 621 B

BIN
bigbluebutton-client/src/org/bigbluebutton/common/assets/images/triangle.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 939 B

8
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
View File

@ -211,16 +211,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
} else if(toolType == DrawObject.RECTANGLE) {
CursorManager.setCursor(rectangle_icon);
} else if(toolType == DrawObject.TRIANGLE) {
CursorManager.setCursor(triangle_icon, 2, -7, 0);
CursorManager.setCursor(triangle_icon);
} else if(toolType == DrawObject.PENCIL) {
CursorManager.setCursor(pencil_icon, 2, 0, -16);
CursorManager.setCursor(pencil_icon, 2, -1, -21);
} else if(toolType == DrawObject.LINE) {
CursorManager.setCursor(line_icon, 2, 0, -14);
CursorManager.setCursor(line_icon);
} else if(toolType == DrawObject.HIGHLIGHTER) {
CursorManager.setCursor(highlighter_icon);
} else if(toolType == DrawObject.ERASER) {
CursorManager.setCursor(eraser_icon);
} else if(toolType == TextObject.TEXT_TOOL) {
} else if(toolType == DrawObject.TEXT) {
CursorManager.setCursor(text_icon);
// } else if(toolType == SelectObject.SELECT_TOOL) {
// CursorManager.setCursor(select_icon);