anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "Prevent ChatTextView from increasing in height after text was entered"

Browse source 
This reverts commit eefce3fd81.
The workaround doesn't seem to be necessary anymore.

fixes #1188
This commit is contained in:
fiaxh 2022-02-04 13:21:13 +01:00
parent 454c00ac0b
commit 3e19778deb
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main/src/ui/chat_input/chat_text_view.vala
View file

@ -35,9 +35,7 @@ public class ChatTextView : ScrolledWindow {
public signal void send_text(); public signal void send_text();
public signal void cancel_input(); public signal void cancel_input();
public TextView text_view = new TextView() { can_focus=true, hexpand=true, wrap_mode=Gtk.WrapMode.WORD_CHAR, valign=Align.CENTER, visible=true }; public TextView text_view = new TextView() { can_focus=true, hexpand=true, margin=8, wrap_mode=Gtk.WrapMode.WORD_CHAR, valign=Align.CENTER, visible=true };
// Hack to prevent the ChatTextView from increasing in height after text was entered
private Label zero_width_label_hack = new Label("​") { hexpand=false, valign=Align.CENTER, opacity=0, visible=true };
private int vscrollbar_min_height; private int vscrollbar_min_height;
private SmileyConverter smiley_converter; private SmileyConverter smiley_converter;
public EditHistory edit_history; public EditHistory edit_history;
@ -46,10 +44,7 @@ public class ChatTextView : ScrolledWindow {
construct { construct {
max_content_height = 300; max_content_height = 300;
propagate_natural_height = true; propagate_natural_height = true;
Box box = new Box(Orientation.HORIZONTAL, 0) { hexpand=true, margin=8, valign=Align.CENTER, visible=true }; this.add(text_view);
box.add(text_view);
box.add(zero_width_label_hack);
this.add(box);
smiley_converter = new SmileyConverter(text_view); smiley_converter = new SmileyConverter(text_view);
edit_history = new EditHistory(text_view); edit_history = new EditHistory(text_view);