Skip to content

Commit

Permalink
panel: move padding fields to new config
Browse files Browse the repository at this point in the history
Related issues:
  - #27
  • Loading branch information
jmc-88 committed Oct 1, 2017
1 parent 972cecd commit 60a9d5e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -693,21 +693,21 @@ bool Reader::AddEntry_Panel(std::string const& key, std::string const& value) {
if (!ParseNumber(value1, &padding_x_lr)) {
return true;
}
panel_config.padding_x_lr_ = panel_config.padding_x_ = padding_x_lr;
new_panel_config.padding_x_lr = new_panel_config.padding_x = padding_x_lr;

if (!value2.empty()) {
int padding_y;
if (!ParseNumber(value2, &padding_y)) {
return true;
}
panel_config.padding_y_ = padding_y;
new_panel_config.padding_y = padding_y;
}
if (!value3.empty()) {
int padding_x;
if (!ParseNumber(value3, &padding_x)) {
return true;
}
panel_config.padding_x_ = padding_x;
new_panel_config.padding_x = padding_x;
}
return true;
}
Expand Down
8 changes: 8 additions & 0 deletions src/panel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ PanelConfig PanelConfig::Default() {
cfg.mouse_pressed_saturation = 0;
cfg.mouse_pressed_brightness = -10;

cfg.padding_x_lr = 0;
cfg.padding_x = 0;
cfg.padding_y = 0;

cfg.width = 100;
cfg.percent_x = true;
cfg.height = 40;
Expand Down Expand Up @@ -682,6 +686,10 @@ void Panel::UseConfig(PanelConfig const& cfg, unsigned int num_desktop) {
config_.monitor = num_desktop;
}

padding_x_lr_ = cfg.padding_x_lr;
padding_x_ = cfg.padding_x;
padding_y_ = cfg.padding_y;

width_ = cfg.width;
height_ = cfg.height;
}
Expand Down
4 changes: 4 additions & 0 deletions src/panel.hh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ class PanelConfig {
int mouse_pressed_saturation;
int mouse_pressed_brightness;

int padding_x_lr;
int padding_x;
int padding_y;

unsigned int width;
bool percent_x;
unsigned int height;
Expand Down

0 comments on commit 60a9d5e

Please sign in to comment.