commit d10ecd19d828709e7cd3e4505dbb40218b1253b0
parent 67b4ec1edd86e5772ce5d5826c127d66c6b54efc
Author: MTRNord <mtrnord1@gmail.com>
Date: Wed, 11 Oct 2017 09:44:06 +0200
try to fix CI
Signed-off-by: MTRNord <mtrnord1@gmail.com>
Diffstat:
5 files changed, 111 insertions(+), 70 deletions(-)
diff --git a/circle.yml b/circle.yml
@@ -15,5 +15,5 @@ dependencies:
test:
pre:
override:
- - if [[ "$DESKTOP" == "true" ]]; then /home/ubuntu/.go_project/bin/qtsetup full desktop && /home/ubuntu/.go_project/bin/qtdeploy test desktop; fi
+ - if [[ "$DESKTOP" == "true" ]]; then /home/ubuntu/.go_project/bin/qtsetup && /home/ubuntu/.go_project/bin/qtdeploy test desktop; fi
post:
diff --git a/elements/messageList.go b/elements/messageList.go
@@ -50,6 +50,7 @@ func (messageViewLayout *QVBoxLayoutWithTriggerSlot) NewMessage(messageBody stri
messageViewLayout.SetSpacing(0)
+ messageViewLayout.AddLayout(messageWidget.Layout(), 1)
messageViewLayout.AddWidget(messageWidget, 0, core.Qt__AlignBottom)
return
diff --git a/qml/ui/chat.ui b/qml/ui/chat.ui
@@ -576,6 +576,9 @@ border-radius: 5px;</string>
<property name="widgetResizable">
<bool>true</bool>
</property>
+ <property name="alignment">
+ <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+ </property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
diff --git a/qml/ui/message.ui b/qml/ui/message.ui
@@ -19,60 +19,70 @@
<widget class="QWidget" name="widget" native="true">
<property name="geometry">
<rect>
- <x>118</x>
- <y>10</y>
+ <x>107</x>
+ <y>4</y>
<width>437</width>
- <height>61</height>
+ <height>77</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>0</number>
+ <widget class="QLabel" name="messageContent">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>27</y>
+ <width>437</width>
+ <height>54</height>
+ </rect>
</property>
- <property name="leftMargin">
- <number>0</number>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>12</pointsize>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
</property>
- <property name="topMargin">
- <number>0</number>
+ <property name="styleSheet">
+ <string notr="true">background-color: rgb(242, 244, 248);
+border: 0;
+border-radius:5px;</string>
</property>
- <property name="rightMargin">
- <number>0</number>
+ <property name="text">
+ <string>Test</string>
</property>
- <property name="bottomMargin">
- <number>0</number>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
- <item>
- <widget class="QLabel" name="messageContent">
- <property name="font">
- <font>
- <family>Arial</family>
- <pointsize>12</pointsize>
- <stylestrategy>PreferAntialias</stylestrategy>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">background-color: rgb(242, 244, 248);
-border: 0;
-border-radius:5px;</string>
- </property>
- <property name="text">
- <string>Test</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- <property name="margin">
- <number>4</number>
- </property>
- <property name="openExternalLinks">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="margin">
+ <number>4</number>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QLabel" name="Sender">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>437</width>
+ <height>21</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>MTRNord</string>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
</widget>
<widget class="QWidget" name="widget_2" native="true">
<property name="geometry">
@@ -89,31 +99,58 @@ border-radius:5px;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <widget class="QLabel" name="avatar">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>84</width>
- <height>84</height>
- </rect>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="leftMargin">
+ <number>0</number>
</property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="topMargin">
+ <number>0</number>
</property>
- <property name="text">
- <string/>
+ <property name="rightMargin">
+ <number>0</number>
</property>
- <property name="pixmap">
- <pixmap>../../../../../../../Downloads/avatar512.png</pixmap>
+ <property name="bottomMargin">
+ <number>0</number>
</property>
- <property name="scaledContents">
- <bool>true</bool>
+ <property name="spacing">
+ <number>0</number>
</property>
- </widget>
+ <item row="0" column="0">
+ <widget class="QWidget" name="widget_3" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <widget class="QLabel" name="avatar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>84</width>
+ <height>84</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap>../../../../../../../Downloads/avatar512.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </widget>
+ </item>
+ </layout>
</widget>
</widget>
<resources/>
diff --git a/uis.go b/uis.go
@@ -253,13 +253,13 @@ func NewMainUI(windowWidth, windowHeight int, cli *gomatrix.Client) *widgets.QWi
})
messageScrollArea.SetLayout(messageListLayout)
- messageScrollArea.SetWidgetResizable(true)
- messageScrollArea.SetObjectName("messageScroll")
- //messageScrollArea.SetStyleSheet("QScrollArea#messageScroll { border: 0px; };")
messageScrollArea.SetHorizontalScrollBarPolicy(core.Qt__ScrollBarAlwaysOff)
messageScrollArea.SetVerticalScrollBarPolicy(core.Qt__ScrollBarAsNeeded)
messageScrollArea.SetContentsMargins(0, 0, 0, 0)
+ messageView.AdjustSize()
+ messageView.SetContentsMargins(0, 0, 0, 0)
messageScrollArea.SetWidget(messageView)
+ messageScrollArea.SetWidgetResizable(false)
syncer.OnEventType("m.room.message", func(ev *gomatrix.Event) {
msg, _ := ev.Body()
