commit d1be0945b23fc662875ff9505cb6054dbd1a1870
parent 184431dab83821d1a8cb01a2ad62e018276f2be5
Author: TheJackiMonster <thejackimonster@gmail.com>
Date: Thu, 28 Oct 2021 20:03:58 +0200
Fixed leaflet scaling of the contacts
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat:
2 files changed, 127 insertions(+), 55 deletions(-)
diff --git a/resources/css/style.css b/resources/css/style.css
@@ -3,6 +3,10 @@
background-color: @theme_bg_color;
}
+.profile-entry {
+ padding: 4px 20px;
+}
+
.chat-entry {
padding: 4px;
}
diff --git a/resources/ui/messenger.ui b/resources/ui/messenger.ui
@@ -27,10 +27,8 @@ Author: Tobias Frisch
<property name="can-focus">False</property>
<child>
<object class="HdyLeaflet" id="leaflet_chat">
- <property name="height-request">600</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="hexpand">True</property>
<property name="hhomogeneous-folded">False</property>
<property name="vhomogeneous-folded">False</property>
<child>
@@ -43,6 +41,7 @@ Author: Tobias Frisch
<property name="width-request">300</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="reveal-flap">False</property>
<property name="fold-policy">always</property>
<child type="content">
<object class="GtkBox">
@@ -118,13 +117,11 @@ Author: Tobias Frisch
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="selectable">False</property>
<child>
- <!-- n-columns=3 n-rows=2 -->
- <object class="GtkGrid">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="column-spacing">8</property>
+ <property name="spacing">8</property>
<child>
<object class="HdyAvatar">
<property name="visible">True</property>
@@ -133,51 +130,81 @@ Author: Tobias Frisch
<property name="size">48</property>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- <property name="height">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes">11.12.13</property>
- <property name="justify">right</property>
- </object>
- <packing>
- <property name="left-attach">2</property>
- <property name="top-attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">Chat title</property>
- <property name="ellipsize">end</property>
- <property name="xalign">2.2351741291171123e-10</property>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes">My evil comment text is awesome! This is coming to the Pinephone which will be extremely awesome and this text may only cut some borders in certain areas!!!</property>
- <property name="ellipsize">end</property>
- <property name="single-line-mode">True</property>
- <property name="max-width-chars">48</property>
- <property name="xalign">0</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Chat title</property>
+ <property name="wrap">True</property>
+ <property name="wrap-mode">word-char</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">2.2351741291171123e-10</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">11.12.13</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack-type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">My evil comment text is awesome! This is coming to the Pinephone which will be extremely awesome and this text may only cut some borders in certain areas!!!</property>
+ <property name="wrap">True</property>
+ <property name="wrap-mode">word-char</property>
+ <property name="ellipsize">end</property>
+ <property name="max-width-chars">48</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- <property name="width">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<style>
@@ -213,11 +240,11 @@ Author: Tobias Frisch
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
+ <property name="width-request">240</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
- <property name="width-request">150</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">16</property>
@@ -227,15 +254,14 @@ Author: Tobias Frisch
<property name="orientation">vertical</property>
<property name="spacing">16</property>
<child>
- <object class="GtkImage">
+ <object class="HdyAvatar">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="xalign">0</property>
- <property name="icon-name">avatar-default-symbolic</property>
- <property name="icon_size">6</property>
+ <property name="halign">start</property>
+ <property name="size">64</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -337,8 +363,9 @@ Author: Tobias Frisch
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
@@ -380,6 +407,51 @@ Author: Tobias Frisch
<object class="GtkListBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="selection-mode">none</property>
+ <child>
+ <object class="GtkListBoxRow">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <object class="HdyAvatar">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="size">36</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Name</property>
+ <property name="wrap">True</property>
+ <property name="wrap-mode">word-char</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <style>
+ <class name="profile-entry"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -928,8 +1000,6 @@ Author: Tobias Frisch
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="activatable">False</property>
- <property name="selectable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@@ -976,8 +1046,6 @@ Author: Tobias Frisch
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can-focus">True</property>
- <property name="activatable">False</property>
- <property name="selectable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
