Skip to content

Commit 705ab9a

Browse files
committed
Update enums
1 parent 4151c55 commit 705ab9a

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

applications/calculator/src/calculator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ int main()
5858
{
5959
ApplicationOpenStatus open_stat = Application::open();
6060

61-
if(open_stat == Success)
61+
if(open_stat == ApplicationOpenStatus::Success)
6262
{
6363
window = Window::create();
6464
window->setTitle("Calculator");

applications/desktop/src/background.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ void background_t::init()
4343
this->addMouseListener([this](ComponentMouseEvent* e)
4444
{
4545
auto position = e->position;
46-
if(e->type == FENSTER_MOUSE_EVENT_MOVE)
46+
if(e->type == fenster::MouseEventType::Move)
4747
{
4848
onMouseMove(position);
4949
}
50-
else if(e->type == FENSTER_MOUSE_EVENT_PRESS && e->buttons & FENSTER_MOUSE_BUTTON_1)
50+
else if(e->type == fenster::MouseEventType::Press && e->buttons & fenster::MouseButton::Button1)
5151
{
5252
onMouseLeftPress(position, e->clickCount);
5353
}
54-
else if(e->type == FENSTER_MOUSE_EVENT_DRAG && e->buttons & FENSTER_MOUSE_BUTTON_1)
54+
else if(e->type == fenster::MouseEventType::Drag && e->buttons & fenster::MouseButton::Button1)
5555
{
5656
onMouseDrag(position);
5757
}
58-
else if(e->type == FENSTER_MOUSE_EVENT_RELEASE)
58+
else if(e->type == fenster::MouseEventType::Release)
5959
{
6060
onMouseRelease(position);
6161
}
62-
else if(e->type == FENSTER_MOUSE_EVENT_LEAVE)
62+
else if(e->type == fenster::MouseEventType::Leave)
6363
{
6464
onMouseRelease(position);
6565
}

applications/desktop/src/desktop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ taskbar_t* taskbar = nullptr;
3333

3434
int main()
3535
{
36-
if(Application::open() != Success)
36+
if(Application::open() != ApplicationOpenStatus::Success)
3737
{
3838
klog("failed to create UI");
3939
return -1;

applications/desktop/src/taskbar.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,23 @@ void taskbar_t::init()
5555
this->addMouseListener([this](ComponentMouseEvent* e)
5656
{
5757
auto position = e->position;
58-
if(e->type == FENSTER_MOUSE_EVENT_MOVE)
58+
if(e->type == fenster::MouseEventType::Move)
5959
{
6060
onMouseMove(position);
6161
}
62-
else if(e->type == FENSTER_MOUSE_EVENT_PRESS && e->buttons & FENSTER_MOUSE_BUTTON_1)
62+
else if(e->type == fenster::MouseEventType::Press && e->buttons & fenster::MouseButton::Button1)
6363
{
6464
onMouseLeftPress(position, e->clickCount);
6565
}
66-
else if(e->type == FENSTER_MOUSE_EVENT_DRAG && e->buttons & FENSTER_MOUSE_BUTTON_1)
66+
else if(e->type == fenster::MouseEventType::Drag && e->buttons & fenster::MouseButton::Button1)
6767
{
6868
onMouseDrag(position);
6969
}
70-
else if(e->type == FENSTER_MOUSE_EVENT_RELEASE)
70+
else if(e->type == fenster::MouseEventType::Release)
7171
{
7272
onMouseRelease(position);
7373
}
74-
else if(e->type == FENSTER_MOUSE_EVENT_LEAVE)
74+
else if(e->type == fenster::MouseEventType::Leave)
7575
{
7676
onMouseLeave(position);
7777
}

applications/fenster

Submodule fenster updated 52 files

applications/navigator/src/navigator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ void navigatorLoad(bool keepHistory)
261261
panel->setMinimumSize(Dimension(100, 100));
262262
panel->addMouseListener([path,nodeType,panel](ComponentMouseEvent* e)
263263
{
264-
if(e->type == FENSTER_MOUSE_EVENT_PRESS)
264+
if(e->type == fenster::MouseEventType::Press)
265265
{
266266
if(e->clickCount == 2)
267267
{
@@ -294,11 +294,11 @@ void navigatorLoad(bool keepHistory)
294294
g_mutex_release(selectedPanelsLock);
295295
}
296296
}
297-
else if(e->type == FENSTER_MOUSE_EVENT_ENTER)
297+
else if(e->type == fenster::MouseEventType::Enter)
298298
{
299299
panel->setBackground(_RGB(230, 240, 255));
300300
}
301-
else if(e->type == FENSTER_MOUSE_EVENT_LEAVE)
301+
else if(e->type == fenster::MouseEventType::Leave)
302302
{
303303
if(std::find(selectedPanels.begin(), selectedPanels.end(), panel) == selectedPanels.end())
304304
{

applications/terminal/src/screen/gui/gui_screen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ bool gui_screen_t::createUi()
101101
});
102102
canvas.component->addMouseListener([this](ComponentMouseEvent* event)
103103
{
104-
if(event->type == FENSTER_MOUSE_EVENT_SCROLL)
104+
if(event->type == fenster::MouseEventType::Scroll)
105105
{
106106
scroll(-event->scroll);
107107
}
@@ -115,7 +115,7 @@ bool gui_screen_t::createUi()
115115
window->setBounds(windowBounds);
116116
window->setVisible(true);
117117

118-
window->addListener(FENSTER_COMPONENT_EVENT_TYPE_FOCUS, new terminal_focus_listener_t(this));
118+
window->addListener(fenster::ComponentEventType::Focus, new terminal_focus_listener_t(this));
119119
window->setFocused(true);
120120

121121
window->onClose([this]()

0 commit comments

Comments
 (0)