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

revert focus when closing dialogs

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-08-16 06:30:09 -07:00
parent 38654bae45
commit 72fd5e03a4
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CommandDialog.cc
View file

@ -130,7 +130,6 @@ void CommandDialog::keyPressEvent(XKeyEvent &event) {
XLookupString(&event, &keychar, 1, &ks, 0); XLookupString(&event, &keychar, 1, &ks, 0);
if (ks == XK_Return) { if (ks == XK_Return) {
hide(); // hide and return focus to a FluxboxWindow
// create Command<void> from line // create Command<void> from line
auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + m_textbox.text())); auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + m_textbox.text()));
if (cmd.get()) if (cmd.get())

8
src/FbTk/TextButton.cc
View file

@ -67,10 +67,10 @@ bool TextButton::setOrientation(FbTk::Orientation orient) {
return false; return false;
invalidateBackground(); invalidateBackground();
if ((m_orientation == FbTk::ROT0 || m_orientation == FbTk::ROT180) && if (((m_orientation == FbTk::ROT0 || m_orientation == FbTk::ROT180) &&
(orient == FbTk::ROT90 || orient == FbTk::ROT270) || (orient == FbTk::ROT90 || orient == FbTk::ROT270)) ||
(m_orientation == FbTk::ROT90 || m_orientation == FbTk::ROT270) && ((m_orientation == FbTk::ROT90 || m_orientation == FbTk::ROT270) &&
(orient == FbTk::ROT0 || orient == FbTk::ROT180)) { (orient == FbTk::ROT0 || orient == FbTk::ROT180))) {
// flip width and height // flip width and height
m_orientation = orient; m_orientation = orient;
resize(height(), width()); resize(height(), width());

6
src/Keys.cc
View file

@ -403,9 +403,9 @@ bool Keys::addBinding(const string &linebuffer) {
// +[1-9] - number between +1 and +9 // +[1-9] - number between +1 and +9
// numbers 10 and above // numbers 10 and above
// //
} else if (!val[argc].empty() && (isdigit(val[argc][0]) && } else if (!val[argc].empty() && ((isdigit(val[argc][0]) &&
(isdigit(val[argc][1]) || val[argc][1] == 'x') || (isdigit(val[argc][1]) || val[argc][1] == 'x')) ||
val[argc][0] == '+' && isdigit(val[argc][1])) ) { (val[argc][0] == '+' && isdigit(val[argc][1])))) {
key = strtoul(val[argc].c_str(), NULL, 0); key = strtoul(val[argc].c_str(), NULL, 0);
type = KeyPress; type = KeyPress;

4
src/fluxbox.hh
View file

@ -160,7 +160,9 @@ public:
void timed_reconfigure(); void timed_reconfigure();
void revertFocus(); void revertFocus();
void setShowingDialog(bool value) { m_showing_dialog = value; } void setShowingDialog(bool value) {
m_showing_dialog = value; if (!value) revertFocus();
}
bool isStartup() const { return m_starting; } bool isStartup() const { return m_starting; }
bool isRestarting() const { return m_restarting; } bool isRestarting() const { return m_restarting; }