Skip to content

Commit e7d4b42

Browse files
committed
Update fenster integration
1 parent 0666f0f commit e7d4b42

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

applications/calculator/src/calculator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <calculator.hpp>
2222
#include <libfenster/button.hpp>
2323
#include <libfenster/label.hpp>
24-
#include <libfenster/textfield.hpp>
24+
#include <libfenster/text_field.hpp>
2525
#include <libfenster/application.hpp>
2626
#include <libfenster/window.hpp>
2727
#include <libfenster/metrics/rectangle.hpp>

applications/navigator/src/navigator.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <libfenster/application.hpp>
2323
#include <libfenster/window.hpp>
2424
#include <libfenster/interface.hpp>
25-
#include <libfenster/textfield.hpp>
25+
#include <libfenster/text_field.hpp>
2626
#include <libfenster/panel.hpp>
2727
#include <libfenster/scrollpane.hpp>
2828
#include <libfenster/label.hpp>
@@ -38,7 +38,7 @@ struct file_entry_t
3838

3939
std::string currentBase = "/";
4040

41-
Scrollpane* scroller;
41+
ScrollPane* scroller;
4242
Panel* content;
4343
TextField* navText;
4444
Button* navPrev;
@@ -138,10 +138,10 @@ int main()
138138
window->setFlexComponentInfo(navBar, 0, 1, 40);
139139

140140
Panel* centerPanel = Panel::create();
141-
centerPanel->setBackground(RGB(255, 255, 255));
141+
centerPanel->setBackground(_RGB(255, 255, 255));
142142
centerPanel->setLayout(FENSTER_LAYOUT_MANAGER_GRID);
143143
{
144-
scroller = Scrollpane::create();
144+
scroller = ScrollPane::create();
145145
content = Panel::create();
146146
content->setLayout(FENSTER_LAYOUT_MANAGER_FLOW);
147147
content->setLayoutPadding(Insets(5, 5, 5, 5));
@@ -285,13 +285,13 @@ void navigatorLoad(bool keepHistory)
285285
}
286286
selectedPanels.clear();
287287
selectedPanels.push_back(panel);
288-
panel->setBackground(RGB(230, 240, 255));
288+
panel->setBackground(_RGB(230, 240, 255));
289289
g_mutex_release(selectedPanelsLock);
290290
}
291291
}
292292
else if(e->type == FENSTER_MOUSE_EVENT_ENTER)
293293
{
294-
panel->setBackground(RGB(230, 240, 255));
294+
panel->setBackground(_RGB(230, 240, 255));
295295
}
296296
else if(e->type == FENSTER_MOUSE_EVENT_LEAVE)
297297
{

0 commit comments

Comments
 (0)