[empathy] Contacts widget is cropped if resized to minimal size
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Contacts widget is cropped if resized to minimal size
- Date: Fri, 28 Jul 2017 09:50:33 +0000 (UTC)
commit 5cd771a7a20fef217ad992f1c77b88ed005c553f
Author: Tomas Popela <tpopela redhat com>
Date: Wed Jul 26 16:05:38 2017 +0200
Contacts widget is cropped if resized to minimal size
Don't put contacts inside the GtkRevealer as it is preventing the label
that's inside it to be wrapped. I don't see a problem in removing the
GtkRevealer as the contacts widget can't be hidden.
src/empathy-roster-window.ui | 474 ++++++++++++++++++++----------------------
1 files changed, 230 insertions(+), 244 deletions(-)
---
diff --git a/src/empathy-roster-window.ui b/src/empathy-roster-window.ui
index b52ee2e..53d2fed 100644
--- a/src/empathy-roster-window.ui
+++ b/src/empathy-roster-window.ui
@@ -1,324 +1,315 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 3 -->
<object class="GtkBox" id="main_vbox">
<property name="can_focus">False</property>
<property name="border-width">12</property>
<property name="orientation">horizontal</property>
<property name="visible">True</property>
<child>
- <object class="GtkRevealer" id="revealer">
- <property name="can_focus">False</property>
+ <object class="PolariFixedSizeFrame" id="sidebar_frame">
<property name="hexpand">False</property>
- <property name="reveal_child">True</property>
- <property name="transition_type">slide-right</property>
+ <property name="width">240</property>
<property name="visible">True</property>
+ <style>
+ <class name="sidebar"/>
+ <class name="chat-sidebar"/>
+ </style>
<child>
- <object class="PolariFixedSizeFrame" id="sidebar_frame">
+ <object class="GtkBox" id="box0">
+ <property name="can_focus">False</property>
<property name="hexpand">False</property>
- <property name="width">240</property>
+ <property name="orientation">vertical</property>
<property name="visible">True</property>
- <style>
- <class name="sidebar"/>
- <class name="chat-sidebar"/>
- </style>
<child>
- <object class="GtkBox" id="box0">
+ <object class="GtkVBox" id="balance_vbox">
<property name="can_focus">False</property>
- <property name="hexpand">False</property>
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkVBox" id="balance_vbox">
- <property name="can_focus">False</property>
- <property name="spacing">3</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
+ <placeholder/>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="errors_vbox">
+ <property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="errors_vbox">
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
+ <placeholder/>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="auth_vbox">
+ <property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="auth_vbox">
- <property name="can_focus">False</property>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <property name="expand">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="roster_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
<child>
<placeholder/>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
</child>
<child>
- <object class="GtkNotebook" id="notebook">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
- <property name="expand">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkScrolledWindow" id="roster_scrolledwindow">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">False</property>
+ <property name="yalign">1</property>
+ <property name="ypad">1</property>
+ <property name="icon_name">avatar-default-symbolic</property>
+ <property name="icon-size">6</property>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkLabel" id="no_entry_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="ypad">1</property>
- <property name="icon_name">avatar-default-symbolic</property>
- <property name="icon-size">6</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="yalign">0.30000001192092896</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkLabel" id="no_entry_label">
+ <object class="GtkButton" id="button_account_settings">
+ <property name="label" translatable="yes">Account settings</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">0.30000001192092896</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="use_action_appearance">False</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkSpinner" id="spinner_loading">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="button_account_settings">
- <property name="label" translatable="yes">Account settings</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="use_action_appearance">False</property>
- </object>
- </child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkSpinner" id="spinner_loading">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkButton" id="button_online">
+ <property name="label" translatable="yes">Go _Online</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="button_online">
- <property name="label" translatable="yes">Go _Online</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <style>
- <class name="suggested-action" />
- </style>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <style>
+ <class name="suggested-action" />
+ </style>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkButton" id="button_show_offline">
+ <property name="label" translatable="yes">Show _Offline Contacts</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="button_show_offline">
- <property name="label" translatable="yes">Show _Offline Contacts</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkButton" id="button_add_contact">
+ <property name="label" translatable="yes">_Add Contact…</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="button_add_contact">
- <property name="label" translatable="yes">_Add Contact…</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkFrame" id="status_area">
+ <property name="can_focus">False</property>
+ <property name="visible">True</property>
+ <style>
+ <class name="chat-status-area"/>
+ </style>
<child>
- <object class="GtkFrame" id="status_area">
+ <object class="GtkGrid" id="status_area_grid0">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="vexpand">False</property>
<property name="visible">True</property>
- <style>
- <class name="chat-status-area"/>
- </style>
<child>
- <object class="GtkGrid" id="status_area_grid0">
+ <object class="GtkGrid" id="status_area_grid1">
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="orientation">horizontal</property>
+ <property name="orientation">vertical</property>
<property name="vexpand">False</property>
<property name="visible">True</property>
<child>
- <object class="GtkGrid" id="status_area_grid1">
+ <object class="GtkHBox" id="presence_toolbar">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <property name="border-width">3</property>
<property name="hexpand">True</property>
- <property name="orientation">vertical</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="status_area_nickname">
+ <property name="can_focus">False</property>
+ <property name="ellipsize">end</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="use_markup">True</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="visible">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkGrid" id="status_area_grid2">
+ <property name="can_focus">False</property>
+ <property name="column_spacing">3</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">horizontal</property>
<property name="vexpand">False</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkHBox" id="presence_toolbar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">3</property>
- <property name="border-width">3</property>
- <property name="hexpand">True</property>
- </object>
- </child>
+ <property name="visible">False</property>
<child>
- <object class="GtkLabel" id="status_area_nickname">
+ <object class="GtkImage" id="status_area_presence_icon">
<property name="can_focus">False</property>
- <property name="ellipsize">end</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- <property name="use_markup">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
+ <property name="icon_size">1</property>
<property name="visible">False</property>
</object>
</child>
<child>
- <object class="GtkGrid" id="status_area_grid2">
+ <object class="GtkLabel" id="status_area_presence_message">
<property name="can_focus">False</property>
- <property name="column_spacing">3</property>
+ <property name="ellipsize">end</property>
+ <property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="orientation">horizontal</property>
- <property name="vexpand">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="visible">False</property>
- <child>
- <object class="GtkImage" id="status_area_presence_icon">
- <property name="can_focus">False</property>
- <property name="icon_size">1</property>
- <property name="visible">False</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="status_area_presence_message">
- <property name="can_focus">False</property>
- <property name="ellipsize">end</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- <property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="visible">False</property>
- </object>
- </child>
</object>
</child>
</object>
@@ -332,11 +323,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkVBox" id="chat_vbox">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
