Changeset 6 for os/trunk/Applications/UDesktop.pas

Timestamp:

Jun 2, 2013, 5:41:42 PM (11 years ago)

Author:

chronos

Message:

• Fixed: TaskBar positioning.

Location:

os/trunk

Files:

• . (modified) (1 prop)
• Applications/UDesktop.pas (modified) (6 diffs)

os/trunk

@@ -2 +2 @@
 *.~dsk
 __history
+*.identcache

@@ -2 +2 @@
 *.~dsk
 __history
+*.identcache

os/trunk/Applications/UDesktop.pas

@@ -9 +9 @@
 type
   TDesktopApp = class(TApplication)
+  private
+    procedure TaskButtonClick(Sender: TObject);
   protected
     function HandleMessage(Message: TMessage): Boolean; override;
@@ -38 +40 @@
   TestApp.Screen := Screen;
   TScreen(Screen).Kernel.RunApplication(TestApp);
+end;
+
+procedure TDesktopApp.TaskButtonClick(Sender: TObject);
+var
+  Process: TProcess;
+begin
+  if Sender is TButton then begin
+    Process := TScreen(Screen).Kernel.Processes[TaskButtons.IndexOf(TButton(Sender))];
+    if Assigned(Process) and Assigned(Process.Application.MainForm) then
+      Process.Application.MainForm.Focused := True;
+  end;
 end;
 
@@ -75 +88 @@
   MainBar.Controls.Add(TaskBar);
   MenuButton := TButton.Create;
-  MenuButton.Parent := MainBar;
+  MenuButton.Parent := TaskBar;
   MenuButton.Bounds := TRectangle.Create(0, 0, 50, 24);
   MenuButton.Visible := True;
@@ -82 +95 @@
   MainBar.Controls.Add(MenuButton);
   TScreen(Screen).Forms.Add(MainBar);
-  UpdateTaskList;
+  MainForm := MainBar;
+  UpdateTaskBar;
   TScreen(Screen).Paint;
 end;
@@ -93 +107 @@
     MainBar.Bounds.Width, MainBar.Bounds.Height);
   UpdateTaskList;
+  TScreen(Screen).Paint;
 end;
 
@@ -120 +135 @@
       TaskButtons[I].Bounds := TRectangle.Create(MenuButton.Bounds.Width +
         I * Width, 0, Width, MainBar.Bounds.Height);
+      TaskButtons[I].OnClick := TaskButtonClick;
       MainBar.Controls.Add(TaskButtons[I]);
     end;

@@ -2 +2 @@
 *.~dsk
 __history
+*.identcache