diff options
| author | fiaxh <git@mx.ax.lt> | 2018-05-10 15:08:14 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2018-05-10 22:17:19 +0200 |
| commit | e852a0a60b1f307b59eff1de02748a36b25eec55 (patch) | |
| tree | 844f4533646ae292a8621f27d4b691990f16190f /main/data/chat_input.ui | |
| parent | 4067e457795d375c1a3e73343837e6383168d352 (diff) | |
| download | dino-e852a0a60b1f307b59eff1de02748a36b25eec55.tar.gz dino-e852a0a60b1f307b59eff1de02748a36b25eec55.zip | |
Move chat input to .ui file, fix smiley conversion on enter
Diffstat (limited to 'main/data/chat_input.ui')
| -rw-r--r-- | main/data/chat_input.ui | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui index 9a8cf424..f639776e 100644 --- a/main/data/chat_input.ui +++ b/main/data/chat_input.ui @@ -4,28 +4,58 @@ <template class="DinoUiChatInputView"> <property name="hexpand">True</property> <property name="orientation">horizontal</property> - <property name="margin">5</property> <property name="visible">True</property> <style> <class name="dino-chatinput"/> </style> <child> - <object class="GtkScrolledWindow" id="scrolled"> - <property name="max_content_height">300</property> - <property name="propagate_natural_height">True</property> + <object class="GtkFrame" id="frame"> + <property name="margin">12</property> + <property name="margin_top">0</property> <property name="visible">True</property> <child> - <object class="GtkFrame"> + <object class="GtkBox" id="outer_box"> + <property name="orientation">horizontal</property> <property name="visible">True</property> <child> - <object class="GtkBox" id="box"> + <object class="GtkButton" id="file_button"> + <property name="can-focus">False</property> + <property name="margin-top">3</property> + <property name="relief">none</property> + <property name="valign">start</property> + <property name="visible">True</property> + <style> + <class name="flat"/> + <class name="dino-chatinput-button"/> + <class name="image-button"/> + </style> + <child> + <object class="GtkImage"> + <property name="icon-name">mail-attachment-symbolic</property> + <property name="icon-size">1</property> + <property name="visible">True</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkSeparator" id="file_separator"> + <property name="orientation">vertical</property> + <property name="visible">True</property> + </object> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolled"> + <property name="max_content_height">300</property> + <property name="propagate_natural_height">true</property> <property name="visible">True</property> <child> <object class="GtkTextView" id="text_input"> - <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property> - <property name="border-width">5</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="margin">8</property> + <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property> + <property name="valign">center</property> <property name="visible">True</property> </object> </child> |