berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

move tab to new window menu

This commit is contained in:
nakst 2021-09-10 10:38:50 +01:00
parent f55902d62d
commit fa613d62d7
7 changed files with 107 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/test.cpp
View File

@ -154,6 +154,7 @@ void InitialiseInstance(EsInstance *instance) {
EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Hang"), [] (EsInstance *, EsElement *, EsCommand *) { while (true); });
EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Wait"), [] (EsInstance *, EsElement *, EsCommand *) { EsSleep(8000); });
EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Wait, then crash"), [] (EsInstance *, EsElement *, EsCommand *) { EsSleep(8000); EsAssert(false); });
EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Wait, then exit"), [] (EsInstance *, EsElement *, EsCommand *) { EsSleep(1000); EsProcessTerminateCurrent(); });
EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Crash 2"), [] (EsInstance *, EsElement *, EsCommand *) {
EsSyscall(ES_SYSCALL_WAIT, 0x8000000000000000, 1, 0, 0);

76
desktop/desktop.cpp
View File

@ -63,6 +63,7 @@ struct ReorderList : EsElement {
};
struct WindowTab : ReorderItem {
// NOTE Don't forget to update WindowTabMoveToNewContainer when modifying this.
struct ContainerWindow *container;
struct ApplicationInstance *applicationInstance;
struct ApplicationInstance *notRespondingInstance;
@ -209,6 +210,8 @@ void ConfigurationWriteToFile();
void OpenDocumentOpenReference(EsObjectID id);
void OpenDocumentCloseReference(EsObjectID id);
void WallpaperLoad(EsGeneric);
WindowTab *WindowTabCreate(ContainerWindow *container);
ContainerWindow *ContainerWindowCreate();
#include "settings.cpp"
@ -439,6 +442,45 @@ void WindowTabActivate(WindowTab *tab, bool force = false) {
}
}
void WindowTabDestroy(WindowTab *tab) {
ContainerWindow *container = tab->container;
if (container->tabBand->items.Length() == 1) {
EsElementDestroy(container->window);
EsElementDestroy(container->taskBarButton);
desktop.allContainerWindows.FindAndDeleteSwap(container, true);
} else {
if (container->active == tab) {
container->active = nullptr;
for (uintptr_t i = 0; i < container->tabBand->items.Length(); i++) {
if (container->tabBand->items[i] != tab) continue;
WindowTabActivate((WindowTab *) container->tabBand->items[i ? (i - 1) : 1]);
break;
}
}
EsElementDestroy(tab);
}
}
void WindowTabMoveToNewContainer(WindowTab *tab) {
// Create the new tab and container window.
WindowTab *newTab = WindowTabCreate(ContainerWindowCreate());
// Move ownership of the instance to the new tab.
newTab->applicationInstance = tab->applicationInstance;
newTab->notRespondingInstance = tab->notRespondingInstance;
EsAssert(tab->applicationInstance->tab == tab);
tab->applicationInstance->tab = newTab;
tab->applicationInstance = nullptr;
tab->notRespondingInstance = nullptr;
// Destroy the old tab, and activate the new one.
WindowTabDestroy(tab); // Deplaces the embedded window from the old container.
WindowTabActivate(newTab);
}
int ContainerWindowMessage(EsElement *element, EsMessage *message) {
ContainerWindow *container = (ContainerWindow *) element->userData.p;
@ -558,6 +600,12 @@ int WindowTabMessage(EsElement *element, EsMessage *message) {
WindowTabClose((WindowTab *) context.p);
}, tab);
if (tab->container->tabBand->items.Length() > 1) {
EsMenuAddItem(menu, ES_FLAGS_DEFAULT, INTERFACE_STRING(DesktopMoveTabToNewWindow), [] (EsMenu *, EsGeneric context) {
WindowTabMoveToNewContainer((WindowTab *) context.p);
}, tab);
}
if (EsKeyboardIsShiftHeld()) {
EsMenuAddSeparator(menu);
@ -581,10 +629,9 @@ int WindowTabMessage(EsElement *element, EsMessage *message) {
return ES_HANDLED;
}
WindowTab *WindowTabCreate(ContainerWindow *container, ApplicationInstance *instance) {
WindowTab *WindowTabCreate(ContainerWindow *container) {
WindowTab *tab = (WindowTab *) EsHeapAllocate(sizeof(WindowTab), true);
tab->container = container;
tab->applicationInstance = instance;
tab->Initialise(container->tabBand, ES_CELL_H_SHRINK | ES_CELL_V_BOTTOM, WindowTabMessage, nullptr);
tab->cName = "window tab";
@ -1196,7 +1243,8 @@ bool ApplicationInstanceStart(int64_t applicationID, EsApplicationStartupInforma
ApplicationInstance *ApplicationInstanceCreate(int64_t id, EsApplicationStartupInformation *startupInformation, ContainerWindow *container, bool hidden) {
ApplicationInstance *instance = (ApplicationInstance *) EsHeapAllocate(sizeof(ApplicationInstance), true);
WindowTab *tab = !hidden ? WindowTabCreate(container ?: ContainerWindowCreate(), instance) : nullptr;
WindowTab *tab = !hidden ? WindowTabCreate(container ?: ContainerWindowCreate()) : nullptr;
if (tab) tab->applicationInstance = instance;
instance->title[0] = ' ';
instance->titleBytes = 1;
instance->tab = tab;
@ -2227,7 +2275,7 @@ void DesktopSyscall(EsMessage *message, uint8_t *buffer, EsBuffer *pipe) {
}
void EmbeddedWindowDestroyed(EsObjectID id) {
EsMenuCloseAll();
EsMenuCloseAll(); // The tab will be destroyed, but menus might be keeping pointers to it.
ApplicationInstance *instance = ApplicationInstanceFindByWindowID(id, true /* remove if found */);
if (!instance) return;
@ -2259,25 +2307,7 @@ void EmbeddedWindowDestroyed(EsObjectID id) {
}
if (instance->tab) {
ContainerWindow *container = instance->tab->container;
if (container->tabBand->items.Length() == 1) {
EsElementDestroy(container->window);
EsElementDestroy(container->taskBarButton);
desktop.allContainerWindows.FindAndDeleteSwap(container, true);
} else {
if (container->active == instance->tab) {
container->active = nullptr;
for (uintptr_t i = 0; i < container->tabBand->items.Length(); i++) {
if (container->tabBand->items[i] != instance->tab) continue;
WindowTabActivate((WindowTab *) container->tabBand->items[i ? (i - 1) : 1]);
break;
}
}
EsElementDestroy(instance->tab);
}
WindowTabDestroy(instance->tab);
} else if (instance->isUserTask) {
desktop.totalUserTaskProgress -= instance->progress;
EsElementRepaint(desktop.tasksButton);

72
desktop/gui.cpp
View File

@ -5289,6 +5289,16 @@ void EsElement::Destroy(bool manual) {
}
}
if (state & UI_STATE_MENU_SOURCE) {
for (uintptr_t i = 0; i < gui.allWindows.Length(); i++) {
if (gui.allWindows[i]->source == this) {
// Close the menu attached to this element.
EsElementDestroy(gui.allWindows[i]);
break;
}
}
}
state |= UI_STATE_DESTROYING | UI_STATE_DESTROYING_CHILD | UI_STATE_BLOCK_INTERACTION;
if (parent) {
@ -6935,42 +6945,46 @@ void UIProcessWindowManagerMessage(EsWindow *window, EsMessage *message, Process
window->mousePosition.x -= windowBounds.l, window->mousePosition.y -= windowBounds.t;
window->hovering = true;
} else if (message->type == ES_MSG_WINDOW_DEACTIVATED) {
AccessKeyModeExit();
if (window->activated) {
AccessKeyModeExit();
if (window->windowStyle == ES_WINDOW_MENU) {
window->Destroy();
if (window->windowStyle == ES_WINDOW_MENU) {
window->Destroy();
}
window->activated = false;
window->hovering = false;
if (window->focused) {
window->inactiveFocus = window->focused;
window->inactiveFocus->Repaint(true);
UIRemoveFocusFromElement(window->focused);
window->focused = nullptr;
}
EsMessageSend(window, message);
UIMaybeRefreshStyleAll(window);
}
window->activated = false;
window->hovering = false;
if (window->focused) {
window->inactiveFocus = window->focused;
window->inactiveFocus->Repaint(true);
UIRemoveFocusFromElement(window->focused);
window->focused = nullptr;
}
EsMessageSend(window, message);
UIMaybeRefreshStyleAll(window);
} else if (message->type == ES_MSG_WINDOW_ACTIVATED) {
AccessKeyModeExit();
if (!window->activated) {
AccessKeyModeExit();
gui.leftModifiers = gui.rightModifiers = 0;
gui.clickChainStartMs = 0;
gui.leftModifiers = gui.rightModifiers = 0;
gui.clickChainStartMs = 0;
window->activated = true;
EsMessage m = { ES_MSG_WINDOW_ACTIVATED };
EsMessageSend(window, &m);
window->activated = true;
EsMessage m = { ES_MSG_WINDOW_ACTIVATED };
EsMessageSend(window, &m);
if (!window->focused && window->inactiveFocus) {
EsElementFocus(window->inactiveFocus, false);
window->inactiveFocus->Repaint(true);
window->inactiveFocus = nullptr;
if (!window->focused && window->inactiveFocus) {
EsElementFocus(window->inactiveFocus, false);
window->inactiveFocus->Repaint(true);
window->inactiveFocus = nullptr;
}
UIRefreshPrimaryClipboard(window);
UIMaybeRefreshStyleAll(window);
}
UIRefreshPrimaryClipboard(window);
UIMaybeRefreshStyleAll(window);
}
skipInputMessage:;

5
kernel/windows.cpp
View File

@ -1186,6 +1186,11 @@ void Window::SetEmbed(EmbeddedWindow *newEmbed) {
if (embed) {
embed->container = this;
ResizeEmbed();
EsMessage message;
EsMemoryZero(&message, sizeof(message));
message.type = windowManager.activeWindow == this ? ES_MSG_WINDOW_ACTIVATED : ES_MSG_WINDOW_DEACTIVATED;
embed->owner->messageQueue.SendMessage(embed->apiWindow, &message);
}
}

BIN
res/Theme Source.dat
View File

Binary file not shown.

BIN
res/Themes/Theme.dat
View File

Binary file not shown.

8
shared/strings.cpp
View File

@ -77,9 +77,6 @@ DEFINE_INTERFACE_STRING(CommonUnitMilliseconds, " ms");
// Desktop.
DEFINE_INTERFACE_STRING(DesktopCloseTab, "Close tab");
DEFINE_INTERFACE_STRING(DesktopInspectUI, "Inspect UI");
DEFINE_INTERFACE_STRING(DesktopCenterWindow, "Center in screen");
DEFINE_INTERFACE_STRING(DesktopNewTabTitle, "New Tab");
DEFINE_INTERFACE_STRING(DesktopShutdownTitle, "Shutdown");
DEFINE_INTERFACE_STRING(DesktopShutdownAction, "Shutdown");
@ -91,6 +88,11 @@ DEFINE_INTERFACE_STRING(DesktopApplicationStartupError, "The requested applicati
DEFINE_INTERFACE_STRING(DesktopNotResponding, "The application is not responding.\nIf you choose to force quit, any unsaved data may be lost.");
DEFINE_INTERFACE_STRING(DesktopConfirmShutdown, "Are you sure you want to turn off your computer? All applications will be closed.");
DEFINE_INTERFACE_STRING(DesktopCloseTab, "Close tab");
DEFINE_INTERFACE_STRING(DesktopMoveTabToNewWindow, "Move to new window");
DEFINE_INTERFACE_STRING(DesktopInspectUI, "Inspect UI");
DEFINE_INTERFACE_STRING(DesktopCenterWindow, "Center in screen");
DEFINE_INTERFACE_STRING(DesktopSettingsApplication, "Settings");
DEFINE_INTERFACE_STRING(DesktopSettingsTitle, "Settings");
DEFINE_INTERFACE_STRING(DesktopSettingsBackButton, "All settings");