From 53ae19c952d58556d29db6b04f59bd7bb2f7b86f Mon Sep 17 00:00:00 2001 From: Edouard Dupin Date: Thu, 22 Dec 2011 10:37:21 +0100 Subject: [PATCH] Add Test of the Label --- jni/Linux.mk | 2 ++ jni/Main.cpp | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/jni/Linux.mk b/jni/Linux.mk index 0e06251..d5ef096 100644 --- a/jni/Linux.mk +++ b/jni/Linux.mk @@ -12,6 +12,8 @@ include $(LOCAL_PATH)/file.mk LOCAL_SRC_FILES := $(FILE_LIST) LOCAL_LDLIBS := +LOCAL_CFLAGS := -DEWOL_USE_FREE_TYPE + include $(BUILD_EXECUTABLE) NDK_MODULE_PATH := $(LOCAL_PATH)/../../ diff --git a/jni/Main.cpp b/jni/Main.cpp index f02049d..c0bb776 100644 --- a/jni/Main.cpp +++ b/jni/Main.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -48,12 +49,19 @@ class Plop :public ewol::Windows ewol::SizerHori * mySizer = new ewol::SizerHori(); SetSubWidget(mySizer); - ewol::Button * myButton = new ewol::Button("LB"); - mySizer->SubWidgetAdd(myButton); - ewol::SizerVert * mySizerVert = new ewol::SizerVert(); mySizer->SubWidgetAdd(mySizerVert); + ewol::Button * myButton = new ewol::Button("LB"); + mySizerVert->SubWidgetAdd(myButton); + ewol::Label * myLabel = new ewol::Label("Mon Mabel"); + myLabel->SetExpendY(true); + myLabel->SetFillY(true); + mySizerVert->SubWidgetAdd(myLabel); + + mySizerVert = new ewol::SizerVert(); + mySizer->SubWidgetAdd(mySizerVert); + myButton = new ewol::Button("BT 3"); myButton->SetExpendX(true); //myButton->SetExpendY(true); @@ -130,7 +138,7 @@ void APP_Init(int argc, char *argv[]) ewol::SetDefaultFont("freefont/FreeMono", 14); #else //ewol::SetDefaultFont("ebtfont/Monospace", 14); - ewol::SetDefaultFont("ebtfont/Monospace", 33); + ewol::SetDefaultFont("ebtfont/Monospace", 22); #endif //ewol::theme::LoadDefault("dataTest/exemple.eol"); /*