...

[xonotic/netradiant.git] / radiant / entityinspector.cpp

diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index da097e465e8f82e0c4411a813f80deb6c0ba9727..de3086d8afa9fa6c018c0a7cae4e060ed5cbc235 100644 (file)
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -277,7 +277,7 @@ public:
   typedef MemberCaller<ModelAttribute, &ModelAttribute::update> UpdateCaller;
   void browse(const BrowsedPathEntry::SetPathCallback& setPath)
   {
-    const char *filename = misc_model_dialog(GTK_WIDGET(m_entry.m_entry.m_frame));
+    const char *filename = misc_model_dialog(gtk_widget_get_toplevel(GTK_WIDGET(m_entry.m_entry.m_frame)));
     
     if(filename != 0)
     {
@@ -1678,15 +1678,19 @@ GtkWidget* EntityInspector_constructWindow(GtkWindow* toplevel)
 
 
   {
-    int x = g_entitysplit1_position;
-    if (x != -1)
+    // show the sliders in any case
+    if(g_entitysplit2_position > 22)
     {
-      gtk_paned_set_position(GTK_PANED(g_entity_split1), x);
-
-      x = g_entitysplit2_position;
-
-      if (x != -1)
-        gtk_paned_set_position (GTK_PANED(g_entity_split2), x);
+      gtk_paned_set_position (GTK_PANED(g_entity_split2), g_entitysplit2_position);
+    } else {
+      g_entitysplit2_position = 22;
+      gtk_paned_set_position (GTK_PANED(g_entity_split2), 22);
+    }
+    if((g_entitysplit1_position - g_entitysplit2_position) > 27)
+    {
+      gtk_paned_set_position (GTK_PANED(g_entity_split1), g_entitysplit1_position);
+    } else {
+      gtk_paned_set_position (GTK_PANED(g_entity_split1), g_entitysplit2_position + 27);
     }
   }