#include "gettext.h"
#include "scripting_game.h"
#include "porting.h"
+#include "main.h"
+#include "settings.h"
#define MY_CHECKPOS(a,b) \
if (v_pos.size() != 2) { \
m_selected_amount(0),
m_selected_dragging(false),
m_tooltip_element(NULL),
+ m_old_tooltip_id(-1),
m_allowclose(true),
m_lock(false),
m_form_src(fsrc),
m_text_dst(tdst),
m_ext_ptr(ext_ptr),
- m_font(dev->getGUIEnvironment()->getSkin()->getFont())
+ m_font(dev->getGUIEnvironment()->getSkin()->getFont()),
+ m_formspec_version(0)
+#ifdef __ANDROID__
+ ,m_JavaDialogFieldName(L"")
+#endif
{
current_keys_pending.key_down = false;
current_keys_pending.key_up = false;
m_doubleclickdetect[0].pos = v2s32(0, 0);
m_doubleclickdetect[1].pos = v2s32(0, 0);
+ m_tooltip_show_delay = (u32)g_settings->getS32("tooltip_show_delay");
+
+ m_btn_height = g_settings->getS32("font_size") +2;
+ assert(m_btn_height > 0);
}
GUIFormSpecMenu::~GUIFormSpecMenu()
{
removeChildren();
-
+
for (u32 i = 0; i < m_tables.size(); ++i) {
GUITable *table = m_tables[i].second;
table->drop();
{
std::vector<std::string> parts = split(element,',');
- if ((parts.size() == 2) || parts.size() == 3) {
+ if (((parts.size() == 2) || parts.size() == 3) ||
+ ((parts.size() > 3) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
v2f invsize;
if (parts[1].find(';') != std::string::npos)
}
}
+ double cur_scaling = porting::getDisplayDensity() *
+ g_settings->getFloat("gui_scaling");
+
if (m_lock) {
v2u32 current_screensize = m_device->getVideoDriver()->getScreenSize();
v2u32 delta = current_screensize - m_lockscreensize;
offset = v2s32(delta.X,delta.Y);
data->screensize = m_lockscreensize;
+
+ // fixed scaling for fixed size gui elements */
+ cur_scaling = LEGACY_SCALING;
}
else {
offset = v2s32(0,0);
}
- padding = v2s32(data->screensize.Y/40, data->screensize.Y/40);
- spacing = v2s32(data->screensize.Y/12, data->screensize.Y/13);
- imgsize = v2s32(data->screensize.Y/15, data->screensize.Y/15);
+ /* adjust image size to dpi */
+ int y_partition = 15;
+ imgsize = v2s32(data->screensize.Y/y_partition, data->screensize.Y/y_partition);
+ int min_imgsize = DEFAULT_IMGSIZE * cur_scaling;
+ while ((min_imgsize > imgsize.Y) && (y_partition > 1)) {
+ y_partition--;
+ imgsize = v2s32(data->screensize.Y/y_partition, data->screensize.Y/y_partition);
+ }
+ assert(y_partition > 0);
+
+ /* adjust spacing to dpi */
+ spacing = v2s32(imgsize.X+(DEFAULT_XSPACING * cur_scaling),
+ imgsize.Y+(DEFAULT_YSPACING * cur_scaling));
+
+ padding = v2s32(data->screensize.Y/imgsize.Y, data->screensize.Y/imgsize.Y);
+
+ /* adjust padding to dpi */
+ padding = v2s32(
+ (padding.X/(2.0/3.0)) * cur_scaling,
+ (padding.X/(2.0/3.0)) * cur_scaling
+ );
data->size = v2s32(
padding.X*2+spacing.X*(invsize.X-1.0)+imgsize.X,
- padding.Y*2+spacing.Y*(invsize.Y-1.0)+imgsize.Y + (data->helptext_h-5)
+ padding.Y*2+spacing.Y*(invsize.Y-1.0)+imgsize.Y + m_btn_height - 5
);
data->rect = core::rect<s32>(
data->screensize.X/2 - data->size.X/2 + offset.X,
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 4) || (parts.size() == 5)) {
+ if (((parts.size() == 4) || (parts.size() == 5)) ||
+ ((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::string location = parts[0];
std::string listname = parts[1];
std::vector<std::string> v_pos = split(parts[2],',');
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() >= 3) || (parts.size() <= 5)) {
+ if (((parts.size() >= 3) || (parts.size() <= 4)) ||
+ ((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::string name = parts[1];
std::string label = parts[2];
std::string selected = "";
-
+
if (parts.size() >= 4)
- selected = parts[3];
-
+ selected = parts[3];
+
MY_CHECKPOS("checkbox",0);
v2s32 pos = padding;
std::wstring wlabel = narrow_to_wide(label.c_str());
core::rect<s32> rect = core::rect<s32>(
- pos.X, pos.Y + ((imgsize.Y/2) - 15),
+ pos.X, pos.Y + ((imgsize.Y/2) - m_btn_height),
pos.X + m_font->getDimension(wlabel.c_str()).Width + 25, // text size + size of checkbox
- pos.Y + ((imgsize.Y/2) + 15));
+ pos.Y + ((imgsize.Y/2) + m_btn_height));
FieldSpec spec(
narrow_to_wide(name.c_str()),
);
spec.ftype = f_CheckBox;
+
gui::IGUICheckBox* e = Environment->addCheckBox(fselected, rect, this,
spec.fid, spec.flabel.c_str());
if (spec.fname == data->focused_fieldname) {
Environment->setFocus(e);
}
- if (parts.size() >= 5)
- spec.tooltip = parts[4];
+
m_checkboxes.push_back(std::pair<FieldSpec,gui::IGUICheckBox*>(spec,e));
m_fields.push_back(spec);
return;
errorstream<< "Invalid checkbox element(" << parts.size() << "): '" << element << "'" << std::endl;
}
+void GUIFormSpecMenu::parseScrollBar(parserData* data, std::string element)
+{
+ std::vector<std::string> parts = split(element,';');
+
+ if (parts.size() >= 5) {
+ std::vector<std::string> v_pos = split(parts[0],',');
+ std::vector<std::string> v_dim = split(parts[1],',');
+ std::string name = parts[2];
+ std::string value = parts[4];
+
+ MY_CHECKPOS("scrollbar",0);
+
+ v2s32 pos = padding;
+ pos.X += stof(v_pos[0]) * (float) spacing.X;
+ pos.Y += stof(v_pos[1]) * (float) spacing.Y;
+
+ if (v_dim.size() != 2) {
+ errorstream<< "Invalid size for element " << "scrollbar"
+ << "specified: \"" << parts[1] << "\"" << std::endl;
+ return;
+ }
+
+ v2s32 dim;
+ dim.X = stof(v_dim[0]) * (float) spacing.X;
+ dim.Y = stof(v_dim[1]) * (float) spacing.Y;
+
+ core::rect<s32> rect =
+ core::rect<s32>(pos.X, pos.Y, pos.X + dim.X, pos.Y + dim.Y);
+
+ FieldSpec spec(
+ narrow_to_wide(name.c_str()),
+ L"",
+ L"",
+ 258+m_fields.size()
+ );
+
+ bool is_horizontal = true;
+
+ if (parts[2] == "vertical")
+ is_horizontal = false;
+
+ spec.ftype = f_ScrollBar;
+ spec.send = true;
+ gui::IGUIScrollBar* e =
+ Environment->addScrollBar(is_horizontal,rect,this,spec.fid);
+
+ e->setMax(1000);
+ e->setMin(0);
+ e->setPos(stoi(parts[4]));
+ e->setSmallStep(10);
+ e->setLargeStep(100);
+
+ if (!m_lock) {
+ core::rect<s32> relative_rect = e->getRelativePosition();
+
+ if (!is_horizontal) {
+ s32 original_width = relative_rect.getWidth();
+ s32 width = (original_width/(2.0/3.0))
+ * porting::getDisplayDensity()
+ * g_settings->getFloat("gui_scaling");
+ e->setRelativePosition(core::rect<s32>(
+ relative_rect.UpperLeftCorner.X,
+ relative_rect.UpperLeftCorner.Y,
+ relative_rect.LowerRightCorner.X + (width - original_width),
+ relative_rect.LowerRightCorner.Y
+ ));
+ }
+ else {
+ s32 original_height = relative_rect.getHeight();
+ s32 height = (original_height/(2.0/3.0))
+ * porting::getDisplayDensity()
+ * g_settings->getFloat("gui_scaling");
+ e->setRelativePosition(core::rect<s32>(
+ relative_rect.UpperLeftCorner.X,
+ relative_rect.UpperLeftCorner.Y,
+ relative_rect.LowerRightCorner.X,
+ relative_rect.LowerRightCorner.Y + (height - original_height)
+ ));
+ }
+ }
+
+ m_scrollbars.push_back(std::pair<FieldSpec,gui::IGUIScrollBar*>(spec,e));
+ m_fields.push_back(spec);
+ return;
+ }
+ errorstream<< "Invalid scrollbar element(" << parts.size() << "): '" << element << "'" << std::endl;
+}
+
void GUIFormSpecMenu::parseImage(parserData* data,std::string element)
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 3) {
+ if ((parts.size() == 3) ||
+ ((parts.size() > 3) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = unescape_string(parts[2]);
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 3) {
+ if ((parts.size() == 3) ||
+ ((parts.size() > 3) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = parts[2];
pos.Y += stof(v_pos[1]) * (float) spacing.Y;
v2s32 geom;
- geom.X = stoi(v_geom[0]) * (float)imgsize.X;
- geom.Y = stoi(v_geom[1]) * (float)imgsize.Y;
+ geom.X = stof(v_geom[0]) * (float)imgsize.X;
+ geom.Y = stof(v_geom[1]) * (float)imgsize.Y;
if(data->bp_set != 2)
errorstream<<"WARNING: invalid use of item_image without a size[] element"<<std::endl;
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 4 || parts.size() == 5) {
+ if ((parts.size() == 4) ||
+ ((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = parts[2];
geom.X = (stof(v_geom[0]) * (float)spacing.X)-(spacing.X-imgsize.X);
pos.Y += (stof(v_geom[1]) * (float)imgsize.Y)/2;
- core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y-15, pos.X+geom.X, pos.Y+15);
+ core::rect<s32> rect =
+ core::rect<s32>(pos.X, pos.Y - m_btn_height,
+ pos.X + geom.X, pos.Y + m_btn_height);
if(data->bp_set != 2)
errorstream<<"WARNING: invalid use of button without a size[] element"<<std::endl;
if (spec.fname == data->focused_fieldname) {
Environment->setFocus(e);
}
- if (parts.size() >= 5)
- spec.tooltip = parts[4];
-
+
m_fields.push_back(spec);
return;
}
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 3) || (parts.size() == 4)) {
+ if (((parts.size() == 3) || (parts.size() == 4)) ||
+ ((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = unescape_string(parts[2]);
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 4) || (parts.size() == 5)) {
+ if (((parts.size() == 4) || (parts.size() == 5)) ||
+ ((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = parts[2];
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 4) || (parts.size() == 5) || (parts.size() == 6)) {
+ if (((parts.size() == 4) || (parts.size() == 5) || (parts.size() == 6)) ||
+ ((parts.size() > 6) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = parts[2];
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 5) {
+ if ((parts.size() == 5) ||
+ ((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::string name = parts[2];
std::vector<std::string> items = split(parts[3],',');
s32 width = stof(parts[1]) * (float)spacing.Y;
- core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, pos.X+width, pos.Y+30);
+ core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y,
+ pos.X + width, pos.Y + (m_btn_height * 2));
std::wstring fname_w = narrow_to_wide(name.c_str());
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 4) {
+ if ((parts.size() == 4) ||
+ ((parts.size() > 4) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string name = parts[2];
geom.X = (stof(v_geom[0]) * (float)spacing.X)-(spacing.X-imgsize.X);
pos.Y += (stof(v_geom[1]) * (float)imgsize.Y)/2;
- pos.Y -= 15;
- geom.Y = 30;
+ pos.Y -= m_btn_height;
+ geom.Y = m_btn_height*2;
core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y);
if (label.length() >= 1)
{
- rect.UpperLeftCorner.Y -= 15;
- rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 15;
+ rect.UpperLeftCorner.Y -= m_btn_height;
+ rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + m_btn_height;
Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, 0);
}
pos.Y = ((m_fields.size()+2)*60);
v2s32 size = DesiredRect.getSize();
- rect = core::rect<s32>(size.X/2-150, pos.Y, (size.X/2-150)+300, pos.Y+30);
+ rect = core::rect<s32>(size.X / 2 - 150, pos.Y,
+ (size.X / 2 - 150) + 300, pos.Y + (m_btn_height*2));
if(m_form_src)
if (label.length() >= 1)
{
- rect.UpperLeftCorner.Y -= 15;
- rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 15;
+ rect.UpperLeftCorner.Y -= m_btn_height;
+ rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + m_btn_height;
Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, 0);
}
}
if (type == "textarea")
{
geom.Y = (stof(v_geom[1]) * (float)imgsize.Y) - (spacing.Y-imgsize.Y);
- pos.Y += 15;
+ pos.Y += m_btn_height;
}
else
{
pos.Y += (stof(v_geom[1]) * (float)imgsize.Y)/2;
- pos.Y -= 15;
- geom.Y = 30;
+ pos.Y -= m_btn_height;
+ geom.Y = m_btn_height*2;
}
core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X, pos.Y+geom.Y);
if (label.length() >= 1)
{
- rect.UpperLeftCorner.Y -= 15;
- rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + 15;
+ rect.UpperLeftCorner.Y -= m_btn_height;
+ rect.LowerRightCorner.Y = rect.UpperLeftCorner.Y + m_btn_height;
Environment->addStaticText(spec.flabel.c_str(), rect, false, true, this, 0);
}
}
return;
}
- if (parts.size() == 5) {
+ if ((parts.size() == 5) ||
+ ((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
parseTextArea(data,parts,type);
return;
}
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 2) {
+ if ((parts.size() == 2) ||
+ ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::string text = parts[1];
std::wstring wlabel = narrow_to_wide(text.c_str());
core::rect<s32> rect = core::rect<s32>(
- pos.X, pos.Y+((imgsize.Y/2)-15),
+ pos.X, pos.Y+((imgsize.Y/2) - m_btn_height),
pos.X + m_font->getDimension(wlabel.c_str()).Width,
- pos.Y+((imgsize.Y/2)+15));
+ pos.Y+((imgsize.Y/2) + m_btn_height));
FieldSpec spec(
L"",
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 2) {
+ if ((parts.size() == 2) ||
+ ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::wstring text = narrow_to_wide(unescape_string(parts[1]));
pos.Y += stof(v_pos[1]) * (float)spacing.Y;
core::rect<s32> rect = core::rect<s32>(
- pos.X, pos.Y+((imgsize.Y/2)-15),
+ pos.X, pos.Y+((imgsize.Y/2)- m_btn_height),
pos.X+15, pos.Y +
(m_font->getKerningHeight() +
m_font->getDimension(text.c_str()).Height)
{
std::vector<std::string> parts = split(element,';');
- if (((parts.size() >= 5) && (parts.size() <= 9)) && (parts.size() != 6)) {
+ if ((((parts.size() >= 5) && (parts.size() <= 8)) && (parts.size() != 6)) ||
+ ((parts.size() > 8) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string image_name = parts[2];
bool noclip = false;
bool drawborder = true;
std::string pressed_image_name = "";
-
+
if (parts.size() >= 7) {
if (parts[5] == "true")
noclip = true;
if (parts[6] == "false")
drawborder = false;
}
-
+
if (parts.size() >= 8) {
pressed_image_name = parts[7];
}
if (spec.fname == data->focused_fieldname) {
Environment->setFocus(e);
}
- if (parts.size() >= 9)
- spec.tooltip = parts[8];
e->setUseAlphaChannel(true);
e->setImage(texture);
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 4) || (parts.size() == 6)) {
+ if (((parts.size() == 4) || (parts.size() == 6)) ||
+ ((parts.size() > 6) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::string name = parts[1];
std::vector<std::string> buttons = split(parts[2],',');
spec.ftype = f_TabHeader;
- v2s32 pos = padding;
+ v2s32 pos(0,0);
pos.X += stof(v_pos[0]) * (float)spacing.X;
- pos.Y += stof(v_pos[1]) * (float)spacing.Y;
+ pos.Y += stof(v_pos[1]) * (float)spacing.Y - m_btn_height * 2;
v2s32 geom;
geom.X = data->screensize.Y;
- geom.Y = 30;
+ geom.Y = m_btn_height*2;
core::rect<s32> rect = core::rect<s32>(pos.X, pos.Y, pos.X+geom.X,
pos.Y+geom.Y);
gui::IGUITabControl *e = Environment->addTabControl(rect, this,
show_background, show_border, spec.fid);
+ e->setAlignment(irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_UPPERLEFT,
+ irr::gui::EGUIA_UPPERLEFT, irr::gui::EGUIA_LOWERRIGHT);
+ e->setTabHeight(m_btn_height*2);
if (spec.fname == data->focused_fieldname) {
Environment->setFocus(e);
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 5) {
+ if ((parts.size() == 5) ||
+ ((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
std::string item_name = parts[2];
ItemStack item;
item.deSerialize(item_name, idef);
video::ITexture *texture = idef->getInventoryTexture(item.getDefinition(idef).name, m_gamedef);
- std::string tooltip = item.getDefinition(idef).description;
+
+ m_tooltips[narrow_to_wide(name.c_str())] =
+ TooltipSpec (item.getDefinition(idef).description,
+ m_default_tooltip_bgcolor,
+ m_default_tooltip_color);
label = unescape_string(label);
FieldSpec spec(
spec.ftype = f_Button;
rect+=data->basepos-padding;
spec.rect=rect;
- spec.tooltip = tooltip;
m_fields.push_back(spec);
return;
}
{
std::vector<std::string> parts = split(element,';');
- if (parts.size() == 3) {
+ if ((parts.size() == 3) ||
+ ((parts.size() > 3) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
std::vector<std::string> v_pos = split(parts[0],',');
std::vector<std::string> v_geom = split(parts[1],',');
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 1) || (parts.size() == 2)) {
+ if (((parts.size() == 1) || (parts.size() == 2)) ||
+ ((parts.size() > 2) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
parseColor(parts[0],m_bgcolor,false);
if (parts.size() == 2) {
{
std::vector<std::string> parts = split(element,';');
- if ((parts.size() == 2) || (parts.size() == 3) || (parts.size() == 5)) {
+ if (((parts.size() == 2) || (parts.size() == 3) || (parts.size() == 5)) ||
+ ((parts.size() > 5) && (m_formspec_version > FORMSPEC_API_VERSION)))
+ {
parseColor(parts[0], m_slotbg_n, false);
parseColor(parts[1], m_slotbg_h, false);
video::SColor tmp_color;
if (parseColor(parts[3], tmp_color, false))
- m_tooltip_element->setBackgroundColor(tmp_color);
+ m_default_tooltip_bgcolor = tmp_color;
if (parseColor(parts[4], tmp_color, false))
- m_tooltip_element->setOverrideColor(tmp_color);
+ m_default_tooltip_color = tmp_color;
}
return;
}
errorstream<< "Invalid listcolors element(" << parts.size() << "): '" << element << "'" << std::endl;
}
-void GUIFormSpecMenu::parseElement(parserData* data,std::string element)
+void GUIFormSpecMenu::parseTooltip(parserData* data, std::string element)
+{
+ std::vector<std::string> parts = split(element,';');
+ if (parts.size() == 2) {
+ std::string name = parts[0];
+ m_tooltips[narrow_to_wide(name.c_str())] = TooltipSpec (parts[1], m_default_tooltip_bgcolor, m_default_tooltip_color);
+ return;
+ } else if (parts.size() == 4) {
+ std::string name = parts[0];
+ video::SColor tmp_color1, tmp_color2;
+ if ( parseColor(parts[2], tmp_color1, false) && parseColor(parts[3], tmp_color2, false) ) {
+ m_tooltips[narrow_to_wide(name.c_str())] = TooltipSpec (parts[1], tmp_color1, tmp_color2);
+ return;
+ }
+ }
+ errorstream<< "Invalid tooltip element(" << parts.size() << "): '" << element << "'" << std::endl;
+}
+
+bool GUIFormSpecMenu::parseVersionDirect(std::string data)
+{
+ //some prechecks
+ if (data == "")
+ return false;
+
+ std::vector<std::string> parts = split(data,'[');
+
+ if (parts.size() < 2) {
+ return false;
+ }
+
+ if (parts[0] != "formspec_version") {
+ return false;
+ }
+
+ if (is_number(parts[1])) {
+ m_formspec_version = mystoi(parts[1]);
+ return true;
+ }
+
+ return false;
+}
+
+void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
{
//some prechecks
if (element == "")
return;
}
+ if (type == "tooltip") {
+ parseTooltip(data,description);
+ return;
+ }
+
+ if (type == "scrollbar") {
+ parseScrollBar(data, description);
+ return;
+ }
+
// Ignore others
infostream
<< "Unknown DrawSpec: type="<<type<<", data=\""<<description<<"\""
void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
{
+ /* useless to regenerate without a screensize */
+ if ((screensize.X <= 0) || (screensize.Y <= 0)) {
+ return;
+ }
+
parserData mydata;
//preserve tables
}
mydata.size= v2s32(100,100);
- mydata.helptext_h = 15;
mydata.screensize = screensize;
// Base position of contents of form
m_itemimages.clear();
m_tables.clear();
m_checkboxes.clear();
+ m_scrollbars.clear();
m_fields.clear();
m_boxes.clear();
+ m_tooltips.clear();
// Set default values (fits old formspec values)
m_bgcolor = video::SColor(140,0,0,0);
m_slotbg_n = video::SColor(255,128,128,128);
m_slotbg_h = video::SColor(255,192,192,192);
+ m_default_tooltip_bgcolor = video::SColor(255,110,130,60);
+ m_default_tooltip_color = video::SColor(255,255,255,255);
+
m_slotbordercolor = video::SColor(200,0,0,0);
m_slotborder = false;
// Note: parent != this so that the tooltip isn't clipped by the menu rectangle
m_tooltip_element = Environment->addStaticText(L"",core::rect<s32>(0,0,110,18));
m_tooltip_element->enableOverrideColor(true);
- m_tooltip_element->setBackgroundColor(video::SColor(255,110,130,60));
+ m_tooltip_element->setBackgroundColor(m_default_tooltip_bgcolor);
m_tooltip_element->setDrawBackground(true);
m_tooltip_element->setDrawBorder(true);
- m_tooltip_element->setOverrideColor(video::SColor(255,255,255,255));
+ m_tooltip_element->setOverrideColor(m_default_tooltip_color);
m_tooltip_element->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
m_tooltip_element->setWordWrap(false);
//we're not parent so no autograb for this one!
m_tooltip_element->grab();
}
-
std::vector<std::string> elements = split(m_formspec_string,']');
- for (unsigned int i=0; i< elements.size(); i++) {
- parseElement(&mydata,elements[i]);
+ unsigned int i = 0;
+
+ /* try to read version from first element only */
+ if (elements.size() >= 1) {
+ if ( parseVersionDirect(elements[0]) ) {
+ i++;
+ }
+ }
+
+ for (; i< elements.size(); i++) {
+ parseElement(&mydata, elements[i]);
}
// If there's fields, add a Proceed button
pos.Y = ((m_fields.size()+2)*60);
v2s32 size = DesiredRect.getSize();
- mydata.rect = core::rect<s32>(size.X/2-70, pos.Y, (size.X/2-70)+140, pos.Y+30);
+ mydata.rect =
+ core::rect<s32>(size.X/2-70, pos.Y,
+ (size.X/2-70)+140, pos.Y + (m_btn_height*2));
wchar_t* text = wgettext("Proceed");
Environment->addButton(mydata.rect, this, 257, text);
delete[] text;
setInitialFocus();
}
+#ifdef __ANDROID__
+bool GUIFormSpecMenu::getAndroidUIInput()
+{
+ /* no dialog shown */
+ if (m_JavaDialogFieldName == L"") {
+ return false;
+ }
+
+ /* still waiting */
+ if (porting::getInputDialogState() == -1) {
+ return true;
+ }
+
+ std::wstring fieldname = m_JavaDialogFieldName;
+ m_JavaDialogFieldName = L"";
+
+ /* no value abort dialog processing */
+ if (porting::getInputDialogState() != 0) {
+ return false;
+ }
+
+ for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
+ iter != m_fields.end(); iter++) {
+
+ if (iter->fname != fieldname) {
+ continue;
+ }
+ IGUIElement* tochange = getElementFromId(iter->fid);
+
+ if (tochange == 0) {
+ return false;
+ }
+
+ if (tochange->getType() != irr::gui::EGUIET_EDIT_BOX) {
+ return false;
+ }
+
+ std::string text = porting::getInputDialogValue();
+
+ ((gui::IGUIEditBox*) tochange)->
+ setText(narrow_to_wide(text).c_str());
+ }
+ return false;
+}
+#endif
+
GUIFormSpecMenu::ItemSpec GUIFormSpecMenu::getItemAtPos(v2s32 p) const
{
core::rect<s32> imgrect(0,0,imgsize.X,imgsize.Y);
{
const ListDrawSpec &s = m_inventorylists[i];
- for(s32 i=0; i<s.geom.X*s.geom.Y; i++)
- {
+ for(s32 i=0; i<s.geom.X*s.geom.Y; i++) {
s32 item_i = i + s.start_item_i;
s32 x = (i%s.geom.X) * spacing.X;
s32 y = (i/s.geom.X) * spacing.Y;
tooltip_text = item.getDefinition(m_gamedef->idef()).description;
if(tooltip_text != "")
{
+ m_tooltip_element->setBackgroundColor(m_default_tooltip_bgcolor);
+ m_tooltip_element->setOverrideColor(m_default_tooltip_color);
m_tooltip_element->setVisible(true);
this->bringToFront(m_tooltip_element);
m_tooltip_element->setText(narrow_to_wide(tooltip_text).c_str());
- s32 tooltip_x = m_pointer.X + 15;
- s32 tooltip_y = m_pointer.Y + 15;
- s32 tooltip_width = m_tooltip_element->getTextWidth() + 15;
+ s32 tooltip_x = m_pointer.X + m_btn_height;
+ s32 tooltip_y = m_pointer.Y + m_btn_height;
+ s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
s32 tooltip_height = m_tooltip_element->getTextHeight() + 5;
m_tooltip_element->setRelativePosition(core::rect<s32>(
core::position2d<s32>(tooltip_x, tooltip_y),
}
}
- m_pointer = m_device->getCursorControl()->getPosition();
-
updateSelectedItem();
gui::IGUISkin* skin = Environment->getSkin();
*/
gui::IGUIElement::draw();
+/* TODO find way to show tooltips on touchscreen */
+#ifndef HAVE_TOUCHSCREENGUI
+ m_pointer = m_device->getCursorControl()->getPosition();
+#endif
+
/*
Draw fields/buttons tooltips
*/
gui::IGUIElement *hovered =
Environment->getRootGUIElement()->getElementFromPoint(m_pointer);
-
+
if (hovered != NULL) {
s32 id = hovered->getID();
- for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
+ u32 delta;
+ if (id == -1) {
+ m_old_tooltip_id = id;
+ m_old_tooltip = "";
+ delta = 0;
+ } else if (id != m_old_tooltip_id) {
+ m_hoovered_time = getTimeMs();
+ m_old_tooltip_id = id;
+ delta = 0;
+ } else if (id == m_old_tooltip_id) {
+ delta = porting::getDeltaMs(m_hoovered_time, getTimeMs());
+ }
+ if (id != -1 && delta >= m_tooltip_show_delay) {
+ for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
iter != m_fields.end(); iter++) {
- if ( (iter->fid == id) && (iter->tooltip != "") ) {
- m_tooltip_element->setVisible(true);
- this->bringToFront(m_tooltip_element);
- m_tooltip_element->setText(narrow_to_wide(iter->tooltip).c_str());
- s32 tooltip_x = m_pointer.X + 15;
- s32 tooltip_y = m_pointer.Y + 15;
- s32 tooltip_width = m_tooltip_element->getTextWidth() + 15;
- if (tooltip_x + tooltip_width > (s32)screenSize.X)
- tooltip_x = (s32)screenSize.X - tooltip_width - 15;
- int lines_count = 1;
- size_t i = 0;
- while ((i = iter->tooltip.find("\n", i)) != std::string::npos) {
- lines_count++;
- i += 2;
+ if ( (iter->fid == id) && (m_tooltips[iter->fname].tooltip != "") ){
+ if (m_old_tooltip != m_tooltips[iter->fname].tooltip) {
+ m_old_tooltip = m_tooltips[iter->fname].tooltip;
+ m_tooltip_element->setText(narrow_to_wide(m_tooltips[iter->fname].tooltip).c_str());
+ s32 tooltip_x = m_pointer.X + m_btn_height;
+ s32 tooltip_y = m_pointer.Y + m_btn_height;
+ s32 tooltip_width = m_tooltip_element->getTextWidth() + m_btn_height;
+ if (tooltip_x + tooltip_width > (s32)screenSize.X)
+ tooltip_x = (s32)screenSize.X - tooltip_width - m_btn_height;
+ int lines_count = 1;
+ size_t i = 0;
+ while ((i = m_tooltips[iter->fname].tooltip.find("\n", i)) != std::string::npos) {
+ lines_count++;
+ i += 2;
+ }
+ s32 tooltip_height = m_tooltip_element->getTextHeight() * lines_count + 5;
+ m_tooltip_element->setRelativePosition(core::rect<s32>(
+ core::position2d<s32>(tooltip_x, tooltip_y),
+ core::dimension2d<s32>(tooltip_width, tooltip_height)));
+ }
+ m_tooltip_element->setBackgroundColor(m_tooltips[iter->fname].bgcolor);
+ m_tooltip_element->setOverrideColor(m_tooltips[iter->fname].color);
+ m_tooltip_element->setVisible(true);
+ this->bringToFront(m_tooltip_element);
+ break;
}
- s32 tooltip_height = m_tooltip_element->getTextHeight() * lines_count + 5;
- m_tooltip_element->setRelativePosition(core::rect<s32>(
- core::position2d<s32>(tooltip_x, tooltip_y),
- core::dimension2d<s32>(tooltip_width, tooltip_height)));
- break;
}
}
}
fields[name] = "false";
}
}
+ else if (s.ftype == f_ScrollBar) {
+ // no dynamic cast possible due to some distributions shipped
+ // without rtti support in irrlicht
+ IGUIElement * element = getElementFromId(s.fid);
+ gui::IGUIScrollBar *e = NULL;
+ if ((element) && (element->getType() == gui::EGUIET_SCROLL_BAR)) {
+ e = static_cast<gui::IGUIScrollBar*>(element);
+ }
+
+ if (e != 0) {
+ std::stringstream os;
+ os << e->getPos();
+ if (s.fdefault == L"Changed")
+ fields[name] = "CHG:" + os.str();
+ else
+ fields[name] = "VAL:" + os.str();
+ }
+ }
else
{
IGUIElement* e = getElementFromId(s.fid);
// Fix Esc/Return key being eaten by checkboxen and tables
if(event.EventType==EET_KEY_INPUT_EVENT) {
KeyPress kp(event.KeyInput);
- if (kp == EscapeKey || kp == getKeySetting("keymap_inventory")
+ if (kp == EscapeKey || kp == CancelKey
+ || kp == getKeySetting("keymap_inventory")
|| event.KeyInput.Key==KEY_RETURN) {
gui::IGUIElement *focused = Environment->getFocus();
if (focused && isMyChild(focused) &&
gui::IGUIElement *hovered =
Environment->getRootGUIElement()->getElementFromPoint(
core::position2d<s32>(x, y));
-
+ if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+ m_old_tooltip_id = -1;
+ m_old_tooltip = "";
+ }
if (!isChild(hovered,this)) {
if (DoubleClickDetection(event)) {
return true;
}
}
+ #ifdef __ANDROID__
+ // display software keyboard when clicking edit boxes
+ if (event.EventType == EET_MOUSE_INPUT_EVENT
+ && event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) {
+ gui::IGUIElement *hovered =
+ Environment->getRootGUIElement()->getElementFromPoint(
+ core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
+ if ((hovered) && (hovered->getType() == irr::gui::EGUIET_EDIT_BOX)) {
+ bool retval = hovered->OnEvent(event);
+ if (retval) {
+ Environment->setFocus(hovered);
+ }
+ m_JavaDialogFieldName = getNameByID(hovered->getID());
+ std::string message = gettext("Enter ");
+ std::string label = wide_to_narrow(getLabelByID(hovered->getID()));
+ if (label == "") {
+ label = "text";
+ }
+ message += gettext(label) + ":";
+
+ /* single line text input */
+ int type = 2;
+
+ /* multi line text input */
+ if (((gui::IGUIEditBox*) hovered)->isMultiLineEnabled()) {
+ type = 1;
+ }
+
+ /* passwords are always single line */
+ if (((gui::IGUIEditBox*) hovered)->isPasswordBox()) {
+ type = 3;
+ }
+
+ porting::showInputDialog(gettext("ok"), "",
+ wide_to_narrow(((gui::IGUIEditBox*) hovered)->getText()),
+ type);
+ return retval;
+ }
+ }
+
+ if (event.EventType == EET_TOUCH_INPUT_EVENT)
+ {
+ SEvent translated;
+ memset(&translated, 0, sizeof(SEvent));
+ translated.EventType = EET_MOUSE_INPUT_EVENT;
+ gui::IGUIElement* root = Environment->getRootGUIElement();
+
+ if (!root) {
+ errorstream
+ << "GUIFormSpecMenu::preprocessEvent unable to get root element"
+ << std::endl;
+ return false;
+ }
+ gui::IGUIElement* hovered = root->getElementFromPoint(
+ core::position2d<s32>(
+ event.TouchInput.X,
+ event.TouchInput.Y));
+
+ translated.MouseInput.X = event.TouchInput.X;
+ translated.MouseInput.Y = event.TouchInput.Y;
+ translated.MouseInput.Control = false;
+
+ bool dont_send_event = false;
+
+ if (event.TouchInput.touchedCount == 1) {
+ switch (event.TouchInput.Event) {
+ case ETIE_PRESSED_DOWN:
+ m_pointer = v2s32(event.TouchInput.X,event.TouchInput.Y);
+ translated.MouseInput.Event = EMIE_LMOUSE_PRESSED_DOWN;
+ translated.MouseInput.ButtonStates = EMBSM_LEFT;
+ m_down_pos = m_pointer;
+ break;
+ case ETIE_MOVED:
+ m_pointer = v2s32(event.TouchInput.X,event.TouchInput.Y);
+ translated.MouseInput.Event = EMIE_MOUSE_MOVED;
+ translated.MouseInput.ButtonStates = EMBSM_LEFT;
+ break;
+ case ETIE_LEFT_UP:
+ translated.MouseInput.Event = EMIE_LMOUSE_LEFT_UP;
+ translated.MouseInput.ButtonStates = 0;
+ hovered = root->getElementFromPoint(m_down_pos);
+ /* we don't have a valid pointer element use last
+ * known pointer pos */
+ translated.MouseInput.X = m_pointer.X;
+ translated.MouseInput.Y = m_pointer.Y;
+
+ /* reset down pos */
+ m_down_pos = v2s32(0,0);
+ break;
+ default:
+ dont_send_event = true;
+ //this is not supposed to happen
+ errorstream
+ << "GUIFormSpecMenu::preprocessEvent unexpected usecase Event="
+ << event.TouchInput.Event << std::endl;
+ }
+ } else if ( (event.TouchInput.touchedCount == 2) &&
+ (event.TouchInput.Event == ETIE_PRESSED_DOWN) ) {
+ hovered = root->getElementFromPoint(m_down_pos);
+
+ translated.MouseInput.Event = EMIE_RMOUSE_PRESSED_DOWN;
+ translated.MouseInput.ButtonStates = EMBSM_LEFT | EMBSM_RIGHT;
+ translated.MouseInput.X = m_pointer.X;
+ translated.MouseInput.Y = m_pointer.Y;
+
+ if (hovered) {
+ hovered->OnEvent(translated);
+ }
+
+ translated.MouseInput.Event = EMIE_RMOUSE_LEFT_UP;
+ translated.MouseInput.ButtonStates = EMBSM_LEFT;
+
+
+ if (hovered) {
+ hovered->OnEvent(translated);
+ }
+ dont_send_event = true;
+ }
+ /* ignore unhandled 2 touch events ... accidental moving for example */
+ else if (event.TouchInput.touchedCount == 2) {
+ dont_send_event = true;
+ }
+ else if (event.TouchInput.touchedCount > 2) {
+ errorstream
+ << "GUIFormSpecMenu::preprocessEvent to many multitouch events "
+ << event.TouchInput.touchedCount << " ignoring them" << std::endl;
+ }
+
+ if (dont_send_event) {
+ return true;
+ }
+
+ /* check if translated event needs to be preprocessed again */
+ if (preprocessEvent(translated)) {
+ return true;
+ }
+ if (hovered) {
+ grab();
+ bool retval = hovered->OnEvent(translated);
+
+ if (event.TouchInput.Event == ETIE_LEFT_UP) {
+ /* reset pointer */
+ m_pointer = v2s32(0,0);
+ }
+ drop();
+ return retval;
+ }
+ }
+ #endif
+
return false;
}
{
if(event.EventType==EET_KEY_INPUT_EVENT) {
KeyPress kp(event.KeyInput);
- if (event.KeyInput.PressedDown && (kp == EscapeKey ||
- kp == getKeySetting("keymap_inventory"))) {
+ if (event.KeyInput.PressedDown && ( (kp == EscapeKey) ||
+ (kp == getKeySetting("keymap_inventory")) || (kp == CancelKey))) {
if (m_allowclose) {
doPause = false;
acceptInput(quit_mode_cancel);
}
}
+
if(event.EventType==EET_MOUSE_INPUT_EVENT
&& event.MouseInput.Event != EMIE_MOUSE_MOVED) {
// Mouse event other than movement
// Get selected item and hovered/clicked item (s)
+ m_old_tooltip_id = -1;
updateSelectedItem();
ItemSpec s = getItemAtPos(m_pointer);
}
if((event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) ||
(event.GUIEvent.EventType == gui::EGET_CHECKBOX_CHANGED) ||
- (event.GUIEvent.EventType == gui::EGET_COMBO_BOX_CHANGED)) {
+ (event.GUIEvent.EventType == gui::EGET_COMBO_BOX_CHANGED) ||
+ (event.GUIEvent.EventType == gui::EGET_SCROLL_BAR_CHANGED)) {
unsigned int btn_id = event.GUIEvent.Caller->getID();
if (btn_id == 257) {
return true;
}
}
- if ((s.ftype == f_DropDown) &&
+ else if ((s.ftype == f_DropDown) &&
(s.fid == event.GUIEvent.Caller->getID())) {
// only send the changed dropdown
for(u32 i=0; i<m_fields.size(); i++) {
}
return true;
}
+ else if ((s.ftype == f_ScrollBar) &&
+ (s.fid == event.GUIEvent.Caller->getID()))
+ {
+ s.fdefault = L"Changed";
+ acceptInput(quit_mode_no);
+ s.fdefault = L"";
+ }
}
}
+
if(event.GUIEvent.EventType == gui::EGET_EDITBOX_ENTER) {
if(event.GUIEvent.Caller->getID() > 257) {
return Parent ? Parent->OnEvent(event) : false;
}
+/**
+ * get name of element by element id
+ * @param id of element
+ * @return name string or empty string
+ */
+std::wstring GUIFormSpecMenu::getNameByID(s32 id)
+{
+ for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
+ iter != m_fields.end(); iter++) {
+ if (iter->fid == id) {
+ return iter->fname;
+ }
+ }
+ return L"";
+}
+
+/**
+ * get label of element by id
+ * @param id of element
+ * @return label string or empty string
+ */
+std::wstring GUIFormSpecMenu::getLabelByID(s32 id)
+{
+ for(std::vector<FieldSpec>::iterator iter = m_fields.begin();
+ iter != m_fields.end(); iter++) {
+ if (iter->fid == id) {
+ return iter->flabel;
+ }
+ }
+ return L"";
+}
+
bool GUIFormSpecMenu::parseColor(const std::string &value, video::SColor &color,
bool quiet)
{
projects / dragonfireclient.git / blobdiff