From 5e0e244b8ab9c946b35b0daf51bf4b13da32233e Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Thu, 7 Jul 2011 22:01:30 +0000
Subject: [PATCH] Fixed layout problem (vertical scrollbar) in ChannelFeed.
 Indent text of the channel message and set it to selectable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ChannelFeed.ui        | 100 ++++++++-----------
 retroshare-gui/src/gui/feeds/ChanMsgItem.cpp |   2 +-
 retroshare-gui/src/gui/feeds/ChanMsgItem.ui  |  63 ++++++------
 3 files changed, 70 insertions(+), 95 deletions(-)

diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui
index ae31412e6..ff4347fa4 100644
--- a/retroshare-gui/src/gui/ChannelFeed.ui
+++ b/retroshare-gui/src/gui/ChannelFeed.ui
@@ -524,71 +524,53 @@ border-image: url(:/images/btn_26_pressed.png) 4;
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QFrame" name="msgFrame">
-         <property name="styleSheet">
-          <string notr="true"/>
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="widgetResizable">
+          <bool>true</bool>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
          </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_8">
-          <property name="margin">
-           <number>0</number>
+         <widget class="QWidget" name="scrollAreaWidgetContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>486</width>
+            <height>333</height>
+           </rect>
           </property>
-          <property name="spacing">
-           <number>0</number>
+          <property name="styleSheet">
+           <string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
           </property>
-          <item row="0" column="0">
-           <widget class="QScrollArea" name="scrollArea">
-            <property name="widgetResizable">
-             <bool>true</bool>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-            </property>
-            <widget class="QWidget" name="scrollAreaWidgetContents">
-             <property name="geometry">
-              <rect>
-               <x>0</x>
-               <y>0</y>
-               <width>484</width>
-               <height>331</height>
-              </rect>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <property name="margin">
+            <number>0</number>
+           </property>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_2"/>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
              </property>
-             <property name="styleSheet">
-              <string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
+             <property name="sizeType">
+              <enum>QSizePolicy::MinimumExpanding</enum>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <property name="margin">
-               <number>0</number>
-              </property>
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_2"/>
-              </item>
-              <item>
-               <spacer name="verticalSpacer">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>391</width>
-                  <height>266</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </widget>
-           </widget>
-          </item>
-         </layout>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>0</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
         </widget>
        </item>
       </layout>
diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
index 3d90d605a..6156f239a 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
@@ -163,7 +163,7 @@ void ChanMsgItem::updateItemStatic()
 	}
 
 	msgLabel->setText(QString::fromStdWString(cmi.msg));
-	msgLabel->setVisible(!cmi.msg.empty());
+	msgWidget->setVisible(!cmi.msg.empty());
 
 	QDateTime qtime;
 	qtime.setTime_t(cmi.ts);
diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
index ba03bf4e6..4744d6ccc 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
@@ -97,22 +97,6 @@ border-radius: 10px;}</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>138</width>
-            <height>1</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </item>
       <item row="0" column="1">
@@ -457,28 +441,37 @@ border-radius: 10px;}</string>
      </property>
      <layout class="QVBoxLayout">
       <item>
-       <widget class="QLabel" name="msgLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="font">
-         <font>
-          <stylestrategy>PreferAntialias</stylestrategy>
-         </font>
-        </property>
+       <widget class="QWidget" name="msgWidget" native="true">
         <property name="styleSheet">
-         <string notr="true">QLabel#msgLabel{border: 2px solid #238;
+         <string notr="true">QWidget#msgWidget{border: 2px solid #238;
 border-radius: 10px;}</string>
         </property>
-        <property name="text">
-         <string notr="true"/>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <property name="margin">
+          <number>5</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="msgLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <stylestrategy>PreferAntialias</stylestrategy>
+            </font>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>