implement bottom-right call button

This commit is contained in:
Matthew Hodgson 2015-10-25 01:03:22 +00:00
parent d8bc362a89
commit 28c3787fb3
10 changed files with 25 additions and 7 deletions

View File

@ -58,7 +58,7 @@ a:visited {
} }
.mx_ContextualMenu { .mx_ContextualMenu {
border: 1px solid #a9dbf4; border: 1px solid #a4a4a4;
border-radius: 8px; border-radius: 8px;
background-color: #fff; background-color: #fff;
color: #747474; color: #747474;
@ -160,7 +160,7 @@ a:visited {
.mx_QuestionDialogTitle { .mx_QuestionDialogTitle {
min-height: 16px; min-height: 16px;
padding: 12px; padding: 12px;
border-bottom: 1px solid #a9dbf4; border-bottom: 1px solid #a4a4a4;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
line-height: 1.4; line-height: 1.4;

View File

@ -97,7 +97,7 @@ limitations under the License.
visibility: hidden; visibility: hidden;
border: 0px; border: 0px;
outline: none; outline: none;
margin-top: 3px; margin-bottom: 3px;
} }
.mx_EventTile:hover .mx_EventTile_editButton { .mx_EventTile:hover .mx_EventTile_editButton {

View File

@ -75,13 +75,19 @@ limitations under the License.
color: #76cfa6; color: #76cfa6;
} }
.mx_MessageComposer_upload { .mx_MessageComposer_upload,
.mx_MessageComposer_call {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
padding-right: 15px; padding-right: 20px;
cursor: pointer; cursor: pointer;
} }
.mx_MessageComposer_call {
padding-right: 10px;
padding-top: 3px;
}
.mx_MessageComposer_upload img { .mx_MessageComposer_upload img {
margin-top: 5px; margin-top: 5px;
} }

View File

@ -17,7 +17,7 @@ limitations under the License.
.mx_RoomTooltip { .mx_RoomTooltip {
display: none; display: none;
position: fixed; position: fixed;
border: 1px solid #a9dbf4; border: 1px solid #a4a4a4;
border-radius: 8px; border-radius: 8px;
background-color: #fff; background-color: #fff;
z-index: 1000; z-index: 1000;

View File

@ -16,7 +16,7 @@ limitations under the License.
.mx_IncomingCallBox { .mx_IncomingCallBox {
text-align: center; text-align: center;
border: 1px solid #a9dbf4; border: 1px solid #a4a4a4;
border-radius: 8px; border-radius: 8px;
background-color: #fff; background-color: #fff;
position: absolute; position: absolute;

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -22,6 +22,7 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer') var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer')
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MessageComposer', displayName: 'MessageComposer',
@ -40,6 +41,14 @@ module.exports = React.createClass({
this.refs.uploadInput.getDOMNode().value = null; this.refs.uploadInput.getDOMNode().value = null;
}, },
onCallClick: function(ev) {
dis.dispatch({
action: 'place_call',
type: ev.shiftKey ? "screensharing" : "video",
room_id: this.props.room.roomId
});
},
render: function() { render: function() {
var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId); var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId);
var uploadInputStyle = {display: 'none'}; var uploadInputStyle = {display: 'none'};
@ -58,6 +67,9 @@ module.exports = React.createClass({
<img src="img/upload.png" width="17" height="22"/> <img src="img/upload.png" width="17" height="22"/>
<input type="file" style={uploadInputStyle} ref="uploadInput" onChange={this.onUploadFileSelected} /> <input type="file" style={uploadInputStyle} ref="uploadInput" onChange={this.onUploadFileSelected} />
</div> </div>
<div className="mx_MessageComposer_call" onClick={this.onCallClick}>
<img src="img/call.png" width="28" height="20"/>
</div>
</div> </div>
</div> </div>
</div> </div>