summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorleo2000-12-15 19:54:11 +0000
committerleo2000-12-15 19:54:11 +0000
commit68c5d0eab6376ba5d9329aa3d3b6cf0023a5bca6 (patch)
treeda5d4ccb019126bbc40f0eb8b814873241e685d7 /linux
parentd9bc55babd4e7fa69e46445d928c8c545376a3cf (diff)
Check that the saved window position is valid
git-svn-id: http://svn.leocad.org/trunk@175 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'linux')
-rw-r--r--linux/main.cpp9
-rw-r--r--linux/main.h11
2 files changed, 14 insertions, 6 deletions
diff --git a/linux/main.cpp b/linux/main.cpp
index fbba97a..6d9d661 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -18,6 +18,7 @@
#include "main.h"
#include "system.h"
#include "config.h"
+#include "dialogs.h"
void create_main_menu (GtkObject *window, GtkWidget *vbox);
@@ -191,6 +192,11 @@ void OnCommand(GtkWidget* widget, gpointer data)
gtk_widget_show (anim_toolbar.handle_box);
} break;
+ case ID_VIEW_TOOLBAR_MODIFY:
+ {
+ modifydlg_toggle ();
+ } break;
+
case ID_VIEW_TOOLBAR_PIECES:
{
gpointer widget = gtk_object_get_data (GTK_OBJECT (main_window), "menu_view_toolbar_floating");
@@ -647,7 +653,8 @@ int main (int argc, char* argv[])
x = Sys_ProfileLoadInt ("Window", "PositionX", -1);
y = Sys_ProfileLoadInt ("Window", "PositionY", -1);
- if (x != -1 && y != -1)
+ if ((x != -1 && y != -1) &&
+ (x < gdk_screen_width () && y < gdk_screen_height ()))
gtk_widget_set_uposition (main_window, x, y);
gtk_signal_connect (GTK_OBJECT (main_window), "delete_event", (GtkSignalFunc) main_quit, NULL);
diff --git a/linux/main.h b/linux/main.h
index d1521ec..e800d41 100644
--- a/linux/main.h
+++ b/linux/main.h
@@ -30,11 +30,12 @@ void OnCommandDirect(GtkWidget *w, gpointer data);
#define ID_VIEW_TOOLBAR_STANDARD 20
#define ID_VIEW_TOOLBAR_DRAWING 21
#define ID_VIEW_TOOLBAR_ANIMATION 22
-#define ID_VIEW_TOOLBAR_PIECES 23
-#define ID_VIEW_TOOLBAR_FLOATING 24
-#define ID_VIEW_TOOLBAR_BOTH 25
-#define ID_VIEW_TOOLBAR_ICONS 26
-#define ID_VIEW_TOOLBAR_TEXT 27
+#define ID_VIEW_TOOLBAR_MODIFY 23
+#define ID_VIEW_TOOLBAR_PIECES 24
+#define ID_VIEW_TOOLBAR_FLOATING 25
+#define ID_VIEW_TOOLBAR_BOTH 26
+#define ID_VIEW_TOOLBAR_ICONS 27
+#define ID_VIEW_TOOLBAR_TEXT 28
#define ID_CAMERA_FIRST 1001
#define ID_CAMERA_LAST 1255