aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>2009-05-21 04:33:07 +0800
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>2009-05-28 00:52:07 +0800
commite9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4 (patch)
treeb8bd1df2ba17bfed2da4fcde089d5f3456bbbe4f
parentda79702908d9c4187469962e1027b11abc416b26 (diff)
downloadgsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.tar
gsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.tar.gz
gsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.tar.bz2
gsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.tar.lz
gsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.tar.xz
gsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.tar.zst
gsoc2013-empathy-e9010cc1e7b3bdaa3366ea530d0d3780dbbfb0a4.zip
Fix double border issue in the Map View
By replace the scrolled view by a viewport, anyway, there can't be scrollbars with libchamplain
-rw-r--r--src/empathy-map-view.c2
-rw-r--r--src/empathy-map-view.ui16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 1a9872558..11e0eb471 100644
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -132,7 +132,7 @@ empathy_map_view_show ()
champlain_view_center_on (window->map_view, 36, 0);
embed = champlain_view_embed_new (window->map_view);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw),
+ gtk_container_add (GTK_CONTAINER (sw),
GTK_WIDGET (embed));
gtk_widget_show_all (embed);
diff --git a/src/empathy-map-view.ui b/src/empathy-map-view.ui
index 8102761c2..f1140399b 100644
--- a/src/empathy-map-view.ui
+++ b/src/empathy-map-view.ui
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
-<!--*- mode: xml -*-->
<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="map_view">
<property name="title" translatable="yes">Contact Map View</property>
<property name="role">map_view</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="window_position">center</property>
<property name="default_width">512</property>
<property name="default_height">384</property>
<child>
@@ -20,6 +21,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
@@ -29,22 +31,20 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="map_scrolledwindow">
+ <object class="GtkViewport" id="map_scrolledwindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="resize_mode">queue</property>
<child>
<placeholder/>
</child>