Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-27 02:11:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set emoji menu under inferior panel on android mode

Browse Source
This commit is contained in:
Angela Mazzurco 2017-09-07 18:13:29 +02:00
parent f435fcda28
commit d9804928dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-qml-app/src/ChatView.qml
View File

@ -100,7 +100,7 @@ Item
anchors.fill: parent anchors.fill: parent
anchors.topMargin: parent.height / 2 anchors.topMargin: parent.height / 2
anchors.bottomMargin: categorySelectorHeight anchors.bottomMargin: if(!androidMode) categorySelectorHeight
property int categorySelectorHeight: 50 property int categorySelectorHeight: 50
@ -114,6 +114,7 @@ Item
name: "EMOJI_HIDDEN" name: "EMOJI_HIDDEN"
PropertyChanges { target: emojiPicker; anchors.topMargin: parent.height } PropertyChanges { target: emojiPicker; anchors.topMargin: parent.height }
PropertyChanges { target: emojiPicker; anchors.bottomMargin: -1 } PropertyChanges { target: emojiPicker; anchors.bottomMargin: -1 }
PropertyChanges { target: emojiPicker; height: 0 }
}, },
State { State {
name: "EMOJI_SHOWN" name: "EMOJI_SHOWN"
@ -132,7 +133,7 @@ Item
id: inferiorPanel id: inferiorPanel
height: ( msgComposer.height > styles.height)? msgComposer.height: styles.height height: ( msgComposer.height > styles.height)? msgComposer.height: styles.height
width: parent.width width: parent.width
anchors.bottom: parent.bottom anchors.bottom: emojiPicker.androidMode ? emojiPicker.top : parent.bottom
Rectangle Rectangle
{ {