From 6d0cfbdfdeafeb1124f02b31dbe83412e331ecd3 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler
Date: Tue, 16 Oct 2018 01:00:24 +0200
Subject: [PATCH] Revert "feat(cpu): Add ramp-coreload-spacing (#1472)"
This reverts commit 06adef1055fee12b8f87eb89278bbe787c785be5.
---
contrib/polybar.aur/PKGBUILD | 2 +-
include/modules/cpu.hpp | 1 -
include/version.hpp | 4 ++--
src/modules/cpu.cpp | 4 +---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
index dd326414..1ee7497c 100644
--- a/contrib/polybar.aur/PKGBUILD
+++ b/contrib/polybar.aur/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Michael Carlberg
# Contributor: Michael Carlberg
pkgname=polybar
-pkgver=3.2.1
+pkgver=3.2.0
pkgrel=1
pkgdesc="A fast and easy-to-use status bar"
arch=("i686" "x86_64")
diff --git a/include/modules/cpu.hpp b/include/modules/cpu.hpp
index 9c310788..f301ff76 100644
--- a/include/modules/cpu.hpp
+++ b/include/modules/cpu.hpp
@@ -37,7 +37,6 @@ namespace modules {
ramp_t m_rampload;
ramp_t m_rampload_core;
label_t m_label;
- int m_ramp_padding;
vector m_cputimes;
vector m_cputimes_prev;
diff --git a/include/version.hpp b/include/version.hpp
index 50edf381..963749bd 100644
--- a/include/version.hpp
+++ b/include/version.hpp
@@ -1,4 +1,4 @@
#pragma once
-#define GIT_TAG "3.2.1"
-#define GIT_TAG_NAMESPACE v3_2_1
+#define GIT_TAG "3.2.0"
+#define GIT_TAG_NAMESPACE v3_2_0
diff --git a/src/modules/cpu.cpp b/src/modules/cpu.cpp
index 9b3eb39e..387c6df0 100644
--- a/src/modules/cpu.cpp
+++ b/src/modules/cpu.cpp
@@ -18,8 +18,6 @@ namespace modules {
cpu_module::cpu_module(const bar_settings& bar, string name_) : timer_module(bar, move(name_)) {
m_interval = m_conf.get(name(), "interval", 1s);
- m_ramp_padding = m_conf.get(name(), "ramp-coreload-spacing", 1);
-
m_formatter->add(DEFAULT_FORMAT, TAG_LABEL, {TAG_LABEL, TAG_BAR_LOAD, TAG_RAMP_LOAD, TAG_RAMP_LOAD_PER_CORE});
// warmup cpu times
@@ -90,7 +88,7 @@ namespace modules {
auto i = 0;
for (auto&& load : m_load) {
if (i++ > 0) {
- builder->space(m_ramp_padding);
+ builder->space(1);
}
builder->node(m_rampload_core->get_by_percentage(load));
}