nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed unneeded m_font

Browse source
This commit is contained in:
akir 2004-10-06 19:02:03 +00:00
parent 7c087a57be
commit d673098ef8
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/CommandDialog.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: CommandDialog.cc,v 1.4 2004/01/21 13:16:09 fluxgen Exp $ // $Id: CommandDialog.cc,v 1.5 2004/10/06 19:02:03 akir Exp $
#include "CommandDialog.hh" #include "CommandDialog.hh"
@ -46,8 +46,7 @@ using namespace std;
CommandDialog::CommandDialog(BScreen &screen, const std::string &title): CommandDialog::CommandDialog(BScreen &screen, const std::string &title):
FbWindow(screen.rootWindow().screenNumber(), FbWindow(screen.rootWindow().screenNumber(),
0, 0, 200, 1, ExposureMask), 0, 0, 200, 1, ExposureMask),
m_font("fixed"), m_textbox(*this, screen.winFrameTheme().font(), ""),
m_textbox(*this, m_font, ""),
m_label(*this, screen.winFrameTheme().font(), title), m_label(*this, screen.winFrameTheme().font(), title),
m_gc(m_textbox), m_gc(m_textbox),
m_screen(screen), m_screen(screen),
@ -61,8 +60,7 @@ CommandDialog::CommandDialog(BScreen &screen, const std::string &title):
CommandDialog::CommandDialog(BScreen &screen, const std::string &title, const std::string &precommand): CommandDialog::CommandDialog(BScreen &screen, const std::string &title, const std::string &precommand):
FbWindow(screen.rootWindow().screenNumber(), FbWindow(screen.rootWindow().screenNumber(),
0, 0, 200, 1, ExposureMask), 0, 0, 200, 1, ExposureMask),
m_font("fixed"), m_textbox(*this, screen.winFrameTheme().font(), ""),
m_textbox(*this, m_font, ""),
m_label(*this, screen.winFrameTheme().font(), title), m_label(*this, screen.winFrameTheme().font(), title),
m_gc(m_textbox), m_gc(m_textbox),
m_screen(screen), m_screen(screen),
@ -249,8 +247,8 @@ void CommandDialog::init() {
void CommandDialog::updateSizes() { void CommandDialog::updateSizes() {
m_label.moveResize(0, 0, m_label.moveResize(0, 0,
width(), m_font.height() + 2); width(), m_textbox.font().height() + 2);
m_textbox.moveResize(2, m_label.height(), m_textbox.moveResize(2, m_label.height(),
width() - 4, m_font.height() + 2); width() - 4, m_textbox.font().height() + 2);
} }

3
src/CommandDialog.hh
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: CommandDialog.hh,v 1.3 2004/01/02 13:48:28 fluxgen Exp $ // $Id: CommandDialog.hh,v 1.4 2004/10/06 19:02:03 akir Exp $
#ifndef RUNCOMMANDDIALOG_HH #ifndef RUNCOMMANDDIALOG_HH
#define RUNCOMMANDDIALOG_HH #define RUNCOMMANDDIALOG_HH
@ -60,7 +60,6 @@ private:
void render(); void render();
void updateSizes(); void updateSizes();
FbTk::Font m_font;
FbTk::TextBox m_textbox; FbTk::TextBox m_textbox;
FbTk::TextButton m_label; FbTk::TextButton m_label;
FbTk::GContext m_gc; FbTk::GContext m_gc;