Attachment #152298 for bug #197150




    unsigned int textlen = visual.size();
    unsigned int button_width = width();
    unsigned int button_height = height();
    const int max_width = static_cast<int>(button_width) - x_offset -
        m_left_padding - m_right_padding;

    if (max_width <= bevel()) {
        return;
    }

    translateSize(m_orientation, button_width, button_height);

    // horizontal alignment, cut off text if needed
    int align_x = FbTk::doAlignment(max_width,
                                    bevel(), justify(), font(),
                                    visual.data(), visual.size(),
                                    textlen); // return new text len

Return to bug 197150

Lines 143-153 Link Here

(-)src/FbTk/TextButton.cc (-1 / +7 lines)
143	unsigned int textlen = visual.size();	143	unsigned int textlen = visual.size();
144	unsigned int button_width = width();	144	unsigned int button_width = width();
145	unsigned int button_height = height();	145	unsigned int button_height = height();
		146	const int max_width = static_cast<int>(button_width) - x_offset -
		147	m_left_padding - m_right_padding;
		148
		149	if (max_width <= bevel()) {
		150	return;
		151	}
146		152
147	translateSize(m_orientation, button_width, button_height);	153	translateSize(m_orientation, button_width, button_height);
148		154
149	// horizontal alignment, cut off text if needed	155	// horizontal alignment, cut off text if needed
150	int align_x = FbTk::doAlignment(button_width - x_offset - m_left_padding - m_right_padding,	156	int align_x = FbTk::doAlignment(max_width,
151	bevel(), justify(), font(),	157	bevel(), justify(), font(),
152	visual.data(), visual.size(),	158	visual.data(), visual.size(),
153	textlen); // return new text len	159	textlen); // return new text len