aboutsummaryrefslogtreecommitdiff
path: root/src/CommandDialog.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/CommandDialog.cc
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/CommandDialog.cc')
-rw-r--r--src/CommandDialog.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index e502bc1..e19cd53 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -98,7 +98,7 @@ void CommandDialog::hide() {
98 98
99 // return focus to fluxbox window 99 // return focus to fluxbox window
100 if (FocusControl::focusedFbWindow()) 100 if (FocusControl::focusedFbWindow())
101 FocusControl::focusedFbWindow()->setInputFocus(); 101 FocusControl::focusedFbWindow()->focus();
102 102
103} 103}
104 104
@@ -193,12 +193,12 @@ void CommandDialog::tabComplete() {
193 193
194void CommandDialog::render() { 194void CommandDialog::render() {
195 Pixmap tmp = m_pixmap; 195 Pixmap tmp = m_pixmap;
196 if (!m_screen.winFrameTheme().labelFocusTexture().usePixmap()) { 196 if (!m_screen.winFrameTheme().iconbarTheme().focusedTexture().usePixmap()) {
197 m_label.setBackgroundColor(m_screen.winFrameTheme().labelFocusTexture().color()); 197 m_label.setBackgroundColor(m_screen.winFrameTheme().iconbarTheme().focusedTexture().color());
198 m_pixmap = 0; 198 m_pixmap = 0;
199 } else { 199 } else {
200 m_pixmap = m_screen.imageControl().renderImage(m_label.width(), m_label.height(), 200 m_pixmap = m_screen.imageControl().renderImage(m_label.width(), m_label.height(),
201 m_screen.winFrameTheme().labelFocusTexture()); 201 m_screen.winFrameTheme().iconbarTheme().focusedTexture());
202 m_label.setBackgroundPixmap(m_pixmap); 202 m_label.setBackgroundPixmap(m_pixmap);
203 } 203 }
204 204
@@ -213,7 +213,7 @@ void CommandDialog::init() {
213 // setup label 213 // setup label
214 // we listen to motion notify too 214 // we listen to motion notify too
215 m_label.setEventMask(m_label.eventMask() | ButtonPressMask | ButtonMotionMask); 215 m_label.setEventMask(m_label.eventMask() | ButtonPressMask | ButtonMotionMask);
216 m_label.setGC(m_screen.winFrameTheme().labelTextFocusGC()); 216 m_label.setGC(m_screen.winFrameTheme().iconbarTheme().focusedText().textGC());
217 m_label.show(); 217 m_label.show();
218 218
219 // setup text box 219 // setup text box