X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fbutton.cpp;h=6b16a130d221d6c55a4dae1b6fe4526bc8fd9a4e;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=148ac84a603be9ae743ddd1b3abe8ca10f442f24;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 148ac84a6..6b16a130d 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -61,13 +61,13 @@ if(state == BT_SHOW_INFO) offset = Vector(size.x, - 10); else if(pos.x + tanslation.x < 100) offset = Vector(size.x, 0); - else + else offset = Vector(-30, -size.y/2); - context.draw_text(info_font, info, pos + offset, LEFT_ALLIGN, LAYER_GUI+2); + context.draw_text(info_font, info, pos + offset, ALIGN_LEFT, LAYER_GUI+2); if(binding != 0) context.draw_text(info_font, "(" + std::string(SDL_GetKeyName(binding)) + ")", pos + offset + Vector(0,12), - LEFT_ALLIGN, LAYER_GUI+2); + ALIGN_LEFT, LAYER_GUI+2); } context.draw_surface_part(image, Vector(0,0), size, pos, LAYER_GUI+1); @@ -162,7 +162,7 @@ for(Buttons::iterator i = buttons.begin(); i != buttons.end(); ++i) i->pos.y + i->size.y > (row + buttons_box.y) * buttons_size.y) continue; - i->draw(context, i->id == button_selected ? true : false); + i->draw(context, i->id == button_selected); } context.pop_transform(); } @@ -178,7 +178,7 @@ switch(event.type) if(mouse_left_button) { - pos.x += int(event.motion.xrel * float(SCREEN_WIDTH)/screen->w); + pos.x += int(event.motion.xrel * float(SCREEN_WIDTH)/screen->w); pos.y += int(event.motion.yrel * float(SCREEN_HEIGHT)/screen->h); caught_event = true; }