mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-10 19:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename StatusBar::m_commands_box to m_commandsBox.

Browse Source
This commit is contained in:
David Capello 2010-08-11 21:28:23 -03:00
parent a6a53bd141
commit cc65870800
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/statebar.cpp
View File

@ -124,7 +124,7 @@ StatusBar::StatusBar()
jwidget_add_child(box1, box2); jwidget_add_child(box1, box2);
jwidget_add_child(box1, m_slider); jwidget_add_child(box1, m_slider);
m_commands_box = box1; m_commandsBox = box1;
App::instance()->CurrentToolChange.connect(&StatusBar::onCurrentToolChange, this); App::instance()->CurrentToolChange.connect(&StatusBar::onCurrentToolChange, this);
} }
@ -318,15 +318,15 @@ bool StatusBar::onProcessMessage(JMessage msg)
{ {
JRect rc = jrect_new_copy(this->rc); JRect rc = jrect_new_copy(this->rc);
rc->x2 -= jrect_w(rc)/4 + 4*jguiscale(); rc->x2 -= jrect_w(rc)/4 + 4*jguiscale();
jwidget_set_rect(m_commands_box, rc); jwidget_set_rect(m_commandsBox, rc);
jrect_free(rc); jrect_free(rc);
} }
return true; return true;
case JM_CLOSE: case JM_CLOSE:
if (!jwidget_has_child(this, m_commands_box)) { if (!jwidget_has_child(this, m_commandsBox)) {
/* append the "commands_box" to destroy it in the jwidget_free */ /* append the "commands_box" to destroy it in the jwidget_free */
jwidget_add_child(this, m_commands_box); jwidget_add_child(this, m_commandsBox);
} }
break; break;
@ -515,7 +515,7 @@ bool StatusBar::onProcessMessage(JMessage msg)
case JM_MOUSEENTER: { case JM_MOUSEENTER: {
bool state = (UIContext::instance()->get_current_sprite() != NULL); bool state = (UIContext::instance()->get_current_sprite() != NULL);
if (!jwidget_has_child(this, m_commands_box) && state) { if (!jwidget_has_child(this, m_commandsBox) && state) {
m_b_first->setEnabled(state); m_b_first->setEnabled(state);
m_b_prev->setEnabled(state); m_b_prev->setEnabled(state);
m_b_play->setEnabled(state); m_b_play->setEnabled(state);
@ -524,7 +524,7 @@ bool StatusBar::onProcessMessage(JMessage msg)
updateFromLayer(); updateFromLayer();
jwidget_add_child(this, m_commands_box); jwidget_add_child(this, m_commandsBox);
jwidget_dirty(this); jwidget_dirty(this);
} }
else { else {
@ -631,14 +631,14 @@ bool StatusBar::onProcessMessage(JMessage msg)
break; break;
case JM_MOUSELEAVE: case JM_MOUSELEAVE:
if (jwidget_has_child(this, m_commands_box)) { if (jwidget_has_child(this, m_commandsBox)) {
// If we want restore the state-bar and the slider doesn't have // If we want restore the state-bar and the slider doesn't have
// the capture... // the capture...
if (jmanager_get_capture() != m_slider) { if (jmanager_get_capture() != m_slider) {
// ...exit from command mode // ...exit from command mode
jmanager_free_focus(); // TODO Review this code jmanager_free_focus(); // TODO Review this code
jwidget_remove_child(this, m_commands_box); jwidget_remove_child(this, m_commandsBox);
jwidget_dirty(this); jwidget_dirty(this);
} }

2
src/widgets/statebar.h
View File

@ -84,7 +84,7 @@ private:
JList m_progress; JList m_progress;
// Box of main commands // Box of main commands
Widget* m_commands_box; Widget* m_commandsBox;
Widget* m_slider; // Opacity slider Widget* m_slider; // Opacity slider
Widget* m_b_first; // Go to first frame Widget* m_b_first; // Go to first frame
Widget* m_b_prev; // Go to previous frame Widget* m_b_prev; // Go to previous frame