summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CommandDialog.cc12
-rw-r--r--src/CommandDialog.hh3
2 files changed, 6 insertions, 9 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index 943302b..d505e72 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: CommandDialog.cc,v 1.4 2004/01/21 13:16:09 fluxgen Exp $ 23// $Id: CommandDialog.cc,v 1.5 2004/10/06 19:02:03 akir Exp $
24 24
25#include "CommandDialog.hh" 25#include "CommandDialog.hh"
26 26
@@ -46,8 +46,7 @@ using namespace std;
46CommandDialog::CommandDialog(BScreen &screen, const std::string &title): 46CommandDialog::CommandDialog(BScreen &screen, const std::string &title):
47 FbWindow(screen.rootWindow().screenNumber(), 47 FbWindow(screen.rootWindow().screenNumber(),
48 0, 0, 200, 1, ExposureMask), 48 0, 0, 200, 1, ExposureMask),
49 m_font("fixed"), 49 m_textbox(*this, screen.winFrameTheme().font(), ""),
50 m_textbox(*this, m_font, ""),
51 m_label(*this, screen.winFrameTheme().font(), title), 50 m_label(*this, screen.winFrameTheme().font(), title),
52 m_gc(m_textbox), 51 m_gc(m_textbox),
53 m_screen(screen), 52 m_screen(screen),
@@ -61,8 +60,7 @@ CommandDialog::CommandDialog(BScreen &screen, const std::string &title):
61CommandDialog::CommandDialog(BScreen &screen, const std::string &title, const std::string &precommand): 60CommandDialog::CommandDialog(BScreen &screen, const std::string &title, const std::string &precommand):
62 FbWindow(screen.rootWindow().screenNumber(), 61 FbWindow(screen.rootWindow().screenNumber(),
63 0, 0, 200, 1, ExposureMask), 62 0, 0, 200, 1, ExposureMask),
64 m_font("fixed"), 63 m_textbox(*this, screen.winFrameTheme().font(), ""),
65 m_textbox(*this, m_font, ""),
66 m_label(*this, screen.winFrameTheme().font(), title), 64 m_label(*this, screen.winFrameTheme().font(), title),
67 m_gc(m_textbox), 65 m_gc(m_textbox),
68 m_screen(screen), 66 m_screen(screen),
@@ -249,8 +247,8 @@ void CommandDialog::init() {
249 247
250void CommandDialog::updateSizes() { 248void CommandDialog::updateSizes() {
251 m_label.moveResize(0, 0, 249 m_label.moveResize(0, 0,
252 width(), m_font.height() + 2); 250 width(), m_textbox.font().height() + 2);
253 251
254 m_textbox.moveResize(2, m_label.height(), 252 m_textbox.moveResize(2, m_label.height(),
255 width() - 4, m_font.height() + 2); 253 width() - 4, m_textbox.font().height() + 2);
256} 254}
diff --git a/src/CommandDialog.hh b/src/CommandDialog.hh
index bc9d3a6..9440866 100644
--- a/src/CommandDialog.hh
+++ b/src/CommandDialog.hh
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: CommandDialog.hh,v 1.3 2004/01/02 13:48:28 fluxgen Exp $ 23// $Id: CommandDialog.hh,v 1.4 2004/10/06 19:02:03 akir Exp $
24 24
25#ifndef RUNCOMMANDDIALOG_HH 25#ifndef RUNCOMMANDDIALOG_HH
26#define RUNCOMMANDDIALOG_HH 26#define RUNCOMMANDDIALOG_HH
@@ -60,7 +60,6 @@ private:
60 void render(); 60 void render();
61 void updateSizes(); 61 void updateSizes();
62 62
63 FbTk::Font m_font;
64 FbTk::TextBox m_textbox; 63 FbTk::TextBox m_textbox;
65 FbTk::TextButton m_label; 64 FbTk::TextButton m_label;
66 FbTk::GContext m_gc; 65 FbTk::GContext m_gc;