diff --git a/data/languages/glsl/highlight.xml b/data/languages/glsl/highlight.xml
index 0a97c96..3b31d6b 100644
--- a/data/languages/glsl/highlight.xml
+++ b/data/languages/glsl/highlight.xml
@@ -38,7 +38,7 @@
type
- \b(void|bool|float|int|(vec|mat|ivect|bvect)[2-4])\b
+ \b(void|bool|float|int|(vec|mat|ivec|bvec)[2-4])\b
storageKeyword
diff --git a/sources/appl/Buffer.cpp b/sources/appl/Buffer.cpp
index db7b11d..b74e7a9 100644
--- a/sources/appl/Buffer.cpp
+++ b/sources/appl/Buffer.cpp
@@ -1051,8 +1051,9 @@ namespace etk {
}
};
-#include
+#include
// declare for signal event
+template class esignal::Signal>;
template class esignal::ISignal>;
diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp
index ad757de..35e1af6 100644
--- a/sources/appl/Gui/MainWindows.cpp
+++ b/sources/appl/Gui/MainWindows.cpp
@@ -282,7 +282,7 @@ void MainWindows::onCallbackMenuEvent(const std::string& _value) {
if (m_widgetSearch == nullptr) {
return;
}
- if (m_widgetSearch->propertyHide == true) {
+ if (m_widgetSearch->propertyHide.get() == true) {
m_widgetSearch->propertyHide.set(false);
m_widgetSearch->selectSearch();
} else {
@@ -302,7 +302,7 @@ void MainWindows::onCallbackMenuEvent(const std::string& _value) {
if (m_widgetSearch == nullptr) {
return;
}
- if (m_widgetSearch->propertyHide == true) {
+ if (m_widgetSearch->propertyHide.get() == true) {
m_widgetSearch->propertyHide.set(false);
m_widgetSearch->selectReplace();
} else {
diff --git a/sources/appl/Gui/TextViewer.cpp b/sources/appl/Gui/TextViewer.cpp
index d31a8c1..0d348bc 100644
--- a/sources/appl/Gui/TextViewer.cpp
+++ b/sources/appl/Gui/TextViewer.cpp
@@ -94,7 +94,7 @@ void appl::TextViewer::onCallbackselectNewFile(const std::string& _value) {
// reset scroll:
if (m_buffer != nullptr) {
- m_buffer->signalUnBindAll(shared_from_this());
+ m_buffer->signalDisconnect(shared_from_this());
bool needAdd = true;
auto it = m_drawingRemenber.begin();
while (it != m_drawingRemenber.end()) {
diff --git a/sources/appl/global.cpp b/sources/appl/global.cpp
index 0b95f57..5f40afb 100644
--- a/sources/appl/global.cpp
+++ b/sources/appl/global.cpp
@@ -54,7 +54,7 @@ bool globals::isSetDisplayEndOfLine() {
}
void globals::setDisplayEndOfLine(bool newVal) {
- l_obj().m_displayEOL = newVal;
+ l_obj().m_displayEOL.set(newVal);
//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
}
@@ -64,7 +64,7 @@ bool globals::isSetDisplaySpaceChar() {
}
void globals::setDisplaySpaceChar(bool _newVal) {
- l_obj().m_displaySpaceChar = _newVal;
+ l_obj().m_displaySpaceChar.set(_newVal);
//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
}
// -----------------------------------------------------------
@@ -73,7 +73,7 @@ bool globals::isSetDisplayTabChar() {
}
void globals::setDisplayTabChar(bool _newVal) {
- l_obj().m_displayTabChar = _newVal;
+ l_obj().m_displayTabChar.set(_newVal);
//ewol::widgetMessageMultiCast::Send(-1, ednMsgUserDisplayChange);
}
@@ -83,7 +83,7 @@ bool globals::isSetAutoIndent() {
}
void globals::setAutoIndent(bool _newVal) {
- l_obj().m_AutoIndent = _newVal;
+ l_obj().m_AutoIndent.set(_newVal);
}
// -----------------------------------------------------------