Procházet zdrojové kódy

Let's not auto-start guitest. guitest2 is so much more useful.

Andreas Kling před 6 roky
rodič
revize
a54848f451
2 změnil soubory, kde provedl 11 přidání a 8 odebrání
  1. 5 2
      Kernel/init.cpp
  2. 6 6
      Userland/guitest2.cpp

+ 5 - 2
Kernel/init.cpp

@@ -24,7 +24,8 @@
 #include "PS2MouseDevice.h"
 #include "PTYMultiplexer.h"
 
-#define SPAWN_GUI_TEST_APP
+//#define SPAWN_GUITEST
+#define SPAWN_GUITEST2
 //#define SPAWN_MULTIPLE_SHELLS
 //#define STRESS_TEST_SPAWNING
 
@@ -102,8 +103,10 @@ static void init_stage2()
     int error;
     //Process::create_user_process("/bin/sh", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0);
     Process::create_user_process("/bin/Terminal", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0);
-#ifdef SPAWN_GUI_TEST_APP
+#ifdef SPAWN_GUITEST
     Process::create_user_process("/bin/guitest", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0);
+#endif
+#ifdef SPAWN_GUITEST2
     Process::create_user_process("/bin/guitest2", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, move(environment), tty0);
 #endif
 #ifdef SPAWN_MULTIPLE_SHELLS

+ 6 - 6
Userland/guitest2.cpp

@@ -61,18 +61,18 @@ GWindow* make_launcher_window()
 {
     auto* window = new GWindow;
     window->set_title("Launcher");
-    window->set_rect({ 100, 400, 80, 200 });
+    window->set_rect({ 100, 400, 100, 200 });
 
     auto* widget = new GWidget;
     window->set_main_widget(widget);
-    widget->set_relative_rect({ 0, 0, 80, 200 });
+    widget->set_relative_rect({ 0, 0, 100, 200 });
 
     auto* label = new GLabel(widget);
-    label->set_relative_rect({ 0, 0, 80, 20 });
+    label->set_relative_rect({ 0, 0, 100, 20 });
     label->set_text("Apps");
 
     auto* terminal_button = new GButton(widget);
-    terminal_button->set_relative_rect({ 5, 20, 70, 20 });
+    terminal_button->set_relative_rect({ 5, 20, 90, 20 });
     terminal_button->set_caption("Terminal");
 
     terminal_button->on_click = [label] (GButton&) {
@@ -88,7 +88,7 @@ GWindow* make_launcher_window()
     };
 
     auto* guitest_button = new GButton(widget);
-    guitest_button->set_relative_rect({ 5, 50, 70, 20 });
+    guitest_button->set_relative_rect({ 5, 50, 90, 20 });
     guitest_button->set_caption("guitest");
 
     guitest_button->on_click = [label] (GButton&) {
@@ -104,7 +104,7 @@ GWindow* make_launcher_window()
     };
 
     auto* dummy_button = new GButton(widget);
-    dummy_button->set_relative_rect({ 5, 80, 70, 20 });
+    dummy_button->set_relative_rect({ 5, 80, 90, 20 });
     dummy_button->set_caption("Dummy");
 
     return window;