From patchwork Thu Oct 10 21:24:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 11184501 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A96A3139A for ; Thu, 10 Oct 2019 21:24:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A36F20B7C for ; Thu, 10 Oct 2019 21:24:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n9ig8Twb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726890AbfJJVY5 (ORCPT ); Thu, 10 Oct 2019 17:24:57 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:41174 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfJJVY5 (ORCPT ); Thu, 10 Oct 2019 17:24:57 -0400 Received: by mail-lj1-f196.google.com with SMTP id f5so7699555ljg.8 for ; Thu, 10 Oct 2019 14:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3cecunE8LfiC2psFh4s1384O2enkWgDcErKitnMnn6o=; b=n9ig8Twb7X7mfum1qYwxZnn9El9ovUnmyUxJDJV9dW86++YlsP+6Bl7cTPgZbOe3IG KGRsk2usRq9QqAln+i4CRc/8u3671MzSawkH6XYB7lmaIRKOOzGdBaeMeqTw3Szx9/S3 39BVfexbChqc38RHkq7kN8Gl1y1S4DL21lz9NemL59PbgRcE3WJuRxiEA5rn1fHjyOxj 0lwlQ5IVz8K/i288/xdFAdpxljmJLLBhGib8vUUsejE+FZyYnCuNjKOtNB6h8iFglXf4 LAy8uVfMUcNaFbRX7WA5SzxgV/WJTuZikjTU0wEBWjOECt39iq+7bpfw27QZdZNf6Ybo akNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3cecunE8LfiC2psFh4s1384O2enkWgDcErKitnMnn6o=; b=J6gWUayc3M9yG83ZgOknFf8dJ+jAmAIWoP6nLu2oo5w1ITX7GoJa4ANqCZVCcIEPNG jUb+w1sthgeyrp6n63nIgfH9f2G8Qr7QmpkLXAx9sCcY7e1WjzxoPWEfrxa3ums0FHYI wLaKtREPH4JqcWvdrIA7WK6gD6u+imqK132CzoAUh0z4ZbhJARgZjEpZjbdApkg03OQh IIddMM/5FPqnIOzmsQouch8FaZsvt0Ax4LQ1kGGafY8CvLYn+dbGSrSCc39wkVm0+Exl KYBo0OkTV+CZDTFgH4CUOk9QdI6lc7Hd1aAOic73kau+bU87/CRN4vijoP770xGTC4FD ju9Q== X-Gm-Message-State: APjAAAXxvccDqlX3Iy1pg0v0XGYsUvyfd3atU9TWxeF+wA+fGqzqp6UY gWMq77Y3dYq/3/QScHr+dSAXMkCKq5A= X-Google-Smtp-Source: APXvYqx0lckkwH8sFNKpn+O1Lm/bM1zMN7TFhTtsYwtDStp8XpWlsXEVlMn322obZgBpe7gHoUl0Gw== X-Received: by 2002:a2e:83d6:: with SMTP id s22mr7310137ljh.95.1570742694878; Thu, 10 Oct 2019 14:24:54 -0700 (PDT) Received: from localhost (128-72-185-159.broadband.corbina.ru. [128.72.185.159]) by smtp.gmail.com with ESMTPSA id g10sm1576013lfb.76.2019.10.10.14.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 14:24:54 -0700 (PDT) From: Mikhail Rudenko To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , "Yordan Karadzhov (VMware)" , Mikhail Rudenko Subject: [PATCH 1/4] kernel-shark: Set text color to black in KsDualMarker's QLabels Date: Fri, 11 Oct 2019 00:24:26 +0300 Message-Id: <20191010212429.469155-2-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010212429.469155-1-mike.rudenko@gmail.com> References: <20191010212429.469155-1-mike.rudenko@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org At present, background color of marker position QLabels is forced to white with a stylesheet, but the text color stays unchanged. As a result, the text is barely visible when using dark color schemes. This patch forces the text color to black for these QLabels, making it readable on all color schemes. Signed-off-by: Mikhail Rudenko --- kernel-shark/src/KsDualMarker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.23.0 diff --git a/kernel-shark/src/KsDualMarker.cpp b/kernel-shark/src/KsDualMarker.cpp index 755e246..0070777 100644 --- a/kernel-shark/src/KsDualMarker.cpp +++ b/kernel-shark/src/KsDualMarker.cpp @@ -156,7 +156,7 @@ KsDualMarkerSM::KsDualMarkerSM(QWidget *parent) for (auto const &l: {&_labelMA, &_labelMB, &_labelDelta}) { l->setFrameStyle(QFrame::Panel | QFrame::Sunken); - l->setStyleSheet("QLabel {background-color : white;}"); + l->setStyleSheet("QLabel {background-color : white; color : black}"); l->setTextInteractionFlags(Qt::TextSelectableByMouse); l->setFixedWidth(FONT_WIDTH * 16); } From patchwork Thu Oct 10 21:24:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 11184503 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 104B5139A for ; Thu, 10 Oct 2019 21:25:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5A44214E0 for ; Thu, 10 Oct 2019 21:24:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UlatgFIy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726944AbfJJVY7 (ORCPT ); Thu, 10 Oct 2019 17:24:59 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:40391 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfJJVY7 (ORCPT ); Thu, 10 Oct 2019 17:24:59 -0400 Received: by mail-lj1-f193.google.com with SMTP id 7so7693203ljw.7 for ; Thu, 10 Oct 2019 14:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MI6RHmowPacvt03t8QqxKg+M8iDlREm88RIKrUuquZA=; b=UlatgFIyGW+buAl1N97s7g9IF2QQinqVCvPqXLD+f4hIlmanT/pUjZG152Y5S/9wXp TQLCQtBrjWNzF/yrxy4rw9KCsR+77LIgVIRlhVfZlJUJNSP0E01Rr30ReDkEbgLoXmCn ndN8Kj60QA6JL2XMLtDc7CJfgrD+oXrxcA9aj0PmUG4z6htC/E8MAXoNnCp6rFZoeu3G C8iYbTueFmyX+r6CkM50ExwqlAv7EsUtR39ALBpb6HLkvcomRUDhVnetiJ+PzOG3SDMf LLiK58DyutaGKubMbWYx0X1SxdzffS9fMtjcI/ujjY8mXvA2nA5uVZWwz2Kv6kHoKcyv 5ETg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MI6RHmowPacvt03t8QqxKg+M8iDlREm88RIKrUuquZA=; b=l5EUZMueC+7DxPsJnjHohpjwy8WJQ/NpAXEtGnYEJMUD7uipDg8DJ+YvluX1DCkYDJ K/Dd0iLXq2Bp0sf+nWrshLd/PFaueT22Z2l8KIxaX7ufD0Ln0ePY5c3WSE68JZ7bwHVB 95LcVOrTQK03JMXQn5VXWBevg/xGF/ai5TGUYtWrigugKBI8VMhjFGUbyS2NuqeTthfn 2uiJ37fI4QfXFmI6tgddqIn4wP+PWpyM6GQsv78ECE2ypsfdiOOZQMuAAwMpjfuh4a2a OmwkAogtQkNNh+mqzshQHp7J9dwxaGbxvdFdDSeYSx9W5LYCGG6ox6b4ouviW9QoAJC/ R6xw== X-Gm-Message-State: APjAAAXz+AOeUJre5BTaXsqawPhiKVTCc8aFwNIjDONnkI13XJFK4ClT aRP5OPsIw5FXF+KN1qLtZYLSS7ECqkE= X-Google-Smtp-Source: APXvYqwj5KxtfKviUiU+bR6EBp5t/zK7maxoTzKnp1DW6xdezjIfhtzUp7mqie+owIM7Cykhc6pJqw== X-Received: by 2002:a2e:88d0:: with SMTP id a16mr7514040ljk.39.1570742697683; Thu, 10 Oct 2019 14:24:57 -0700 (PDT) Received: from localhost (128-72-185-159.broadband.corbina.ru. [128.72.185.159]) by smtp.gmail.com with ESMTPSA id t22sm1588037lfg.91.2019.10.10.14.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 14:24:57 -0700 (PDT) From: Mikhail Rudenko To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , "Yordan Karadzhov (VMware)" , Mikhail Rudenko Subject: [PATCH 2/4] kernel-shark: Set text color to black in pointer position QLabel Date: Fri, 11 Oct 2019 00:24:27 +0300 Message-Id: <20191010212429.469155-3-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010212429.469155-1-mike.rudenko@gmail.com> References: <20191010212429.469155-1-mike.rudenko@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org At present, the background color of the pointer position QLabel is forced to white with a stylesheet, but the text color stays unchanged. As a result, the text is barely visible when using dark color schemes. This patch forces the text color to black for this QLabel, making it readable on all color schemes. Signed-off-by: Mikhail Rudenko --- kernel-shark/src/KsTraceGraph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.23.0 diff --git a/kernel-shark/src/KsTraceGraph.cpp b/kernel-shark/src/KsTraceGraph.cpp index 2e48372..73e7577 100644 --- a/kernel-shark/src/KsTraceGraph.cpp +++ b/kernel-shark/src/KsTraceGraph.cpp @@ -62,7 +62,7 @@ KsTraceGraph::KsTraceGraph(QWidget *parent) _pointerBar.addWidget(&_labelP1); _labelP2.setFrameStyle(QFrame::Panel | QFrame::Sunken); - _labelP2.setStyleSheet("QLabel { background-color : white;}"); + _labelP2.setStyleSheet("QLabel { background-color : white; color: black}"); _labelP2.setTextInteractionFlags(Qt::TextSelectableByMouse); _labelP2.setFixedWidth(FONT_WIDTH * 16); _pointerBar.addWidget(&_labelP2); From patchwork Thu Oct 10 21:24:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 11184505 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 061001575 for ; Thu, 10 Oct 2019 21:25:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB139214E0 for ; Thu, 10 Oct 2019 21:25:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Iwd4JqLw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727008AbfJJVZB (ORCPT ); Thu, 10 Oct 2019 17:25:01 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:39118 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfJJVZB (ORCPT ); Thu, 10 Oct 2019 17:25:01 -0400 Received: by mail-lj1-f195.google.com with SMTP id y3so7699751ljj.6 for ; Thu, 10 Oct 2019 14:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PIdqMlrZyLl4YR13KZU/L3Tp7uwHPIXvCOdR8E72pqo=; b=Iwd4JqLwYHfdYRzZ4UG79uX+CHV3QW2KsNTWs1iVIsHBf+3Gr3i3TyQti9wZD0+bHF l0zKJXTx+G/tN/WlcA2EMxhxOf/zCh3rz9oUy4goAzp6AxnpzOQa10Vhx6xi+5arh7B8 rMFUe5kOSq1OqxMcli+aLF5sb3fenTB2/+cmWuLD0zh3S5kbYgXeaYQ15w1jIHQJ1K9Y PCXBXAtntngNtiMJSQ7Gs3WXPLEv0n7Ox3L0EPaPJGP1lipmSw1AXg79p0fxi2f2f8Cg fJtbNzDgQlCzYDKh4EzCg8EyaWbk+yLreCAuPB4VNC+4/r4hn/EEzx3uoy8emPEV3RKS KCbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PIdqMlrZyLl4YR13KZU/L3Tp7uwHPIXvCOdR8E72pqo=; b=hPLM6t6+qZ+vB2dIwskViU6vSsUO+FZxm55Gbf8eY8sQqt9eevyeVPXVmTmX+f6V0u sTpv4B2N2OWZwPwMtCg+eR/n6QvU9QKnMCTnY5E1pybGvDeycWp2csMSfJvFskpgkudO JZnmb5kdKWo+ws5dGdlyjyqCkWpVHOyFB1nYio3YWwGrilmxlL2ns7o4BNldLEXIO1I4 BZO7/yAnOL8+HVqclAAk7Kr6Q2i5X/6ncQalzXlGtMQO221rR1ny09LbL5u5pRuviiy9 lAwGaUmcBv1/KJjsTc8P7zBiTNv3R3qRg0bt9Lg8b7/9FaSAPhQ2Z6kV6+V43xEXueFS CK/Q== X-Gm-Message-State: APjAAAVdjnp3cJFehOL/PLRK3kU5X/1lwdpMMZZQFR7t/sP9OPjtac42 XIXjuTQU48l1o9Ahz7nDmvbv4KATX5E= X-Google-Smtp-Source: APXvYqy9a2tAuBYRzf32SBQvp5bekkvVBUIYEz8qMh4U7c8nB1oGKkHje6BfH3v879QqaAmYKh+W3w== X-Received: by 2002:a2e:2901:: with SMTP id u1mr7521804lje.78.1570742699325; Thu, 10 Oct 2019 14:24:59 -0700 (PDT) Received: from localhost (128-72-185-159.broadband.corbina.ru. [128.72.185.159]) by smtp.gmail.com with ESMTPSA id g10sm1576074lfb.76.2019.10.10.14.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 14:24:58 -0700 (PDT) From: Mikhail Rudenko To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , "Yordan Karadzhov (VMware)" , Mikhail Rudenko Subject: [PATCH 3/4] kernel-shark: Set text color to black in KsTraceGraph's axes labels Date: Fri, 11 Oct 2019 00:24:28 +0300 Message-Id: <20191010212429.469155-4-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010212429.469155-1-mike.rudenko@gmail.com> References: <20191010212429.469155-1-mike.rudenko@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org At present, background color of axes labels of the plot is forced to white with a stylesheet, but the text color stays unchanged. As a result, text is barely visible when using dark color schemes. This patch forces the text color to black for these labels, making them readable on all color schemes. Signed-off-by: Mikhail Rudenko --- kernel-shark/src/KsTraceGraph.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.23.0 diff --git a/kernel-shark/src/KsTraceGraph.cpp b/kernel-shark/src/KsTraceGraph.cpp index 73e7577..90f83f3 100644 --- a/kernel-shark/src/KsTraceGraph.cpp +++ b/kernel-shark/src/KsTraceGraph.cpp @@ -96,6 +96,8 @@ KsTraceGraph::KsTraceGraph(QWidget *parent) _legendAxisX.layout()->addWidget(&_labelXMin); _legendAxisX.layout()->addWidget(&_labelXMid); _legendAxisX.layout()->addWidget(&_labelXMax); + _legendAxisX.setStyleSheet("QLabel { background-color : white; color: black}"); + _drawWindow.setMinimumSize(100, 100); _drawWindow.setStyleSheet("QWidget {background-color : white;}"); @@ -580,7 +582,7 @@ void KsTraceGraph::_updateGraphLegends() width = STRING_WIDTH(graphName); name->setAlignment(Qt::AlignBottom); - name->setStyleSheet("QLabel {background-color : white;}"); + name->setStyleSheet("QLabel {background-color : white; color : black}"); name->setFixedHeight(KS_GRAPH_HEIGHT); layout->addWidget(name); }; From patchwork Thu Oct 10 21:24:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 11184507 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0DB831575 for ; Thu, 10 Oct 2019 21:25:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1D4E20B7C for ; Thu, 10 Oct 2019 21:25:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q6YGcS+o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726866AbfJJVZD (ORCPT ); Thu, 10 Oct 2019 17:25:03 -0400 Received: from mail-lj1-f179.google.com ([209.85.208.179]:41503 "EHLO mail-lj1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfJJVZD (ORCPT ); Thu, 10 Oct 2019 17:25:03 -0400 Received: by mail-lj1-f179.google.com with SMTP id f5so7699801ljg.8 for ; Thu, 10 Oct 2019 14:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f90xKkaJL4etj1oD+PDWDp1y3j25xrlkUDtHcZWiu50=; b=Q6YGcS+o1oUfNZQugT8nmhkYYjfcT+Raz0LISv2cVHsbfAL/8tLZfwyJ/ms8R8ngnX fFc4IFB4QJrwyOFCiOz0yfy3nsqFH9T9DsREdkFXWpAeVayOsokyrQgnsIHA6XRE7mpw MkhTF9uo9jYIZdCOvxfFbA/lc2EjIgUZwICChW9X1mZX7gC4sOpOG4hHvxN6Gw6AlrIN h0I/nq7PMNNtYn5vobQ8oZsoW5xtEc1kxQpQsqecPKdqkaiXe/jiueH5MM/6aG8vMzv6 HBsFTWmjrQKE4ntroGwO7mUiOI1bj2PsPZ1ujH69pW/D4kKqRYcUFOmsOWFSxan4yMQ8 1YsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f90xKkaJL4etj1oD+PDWDp1y3j25xrlkUDtHcZWiu50=; b=o8wqhXa0ZA3l3yUkxjqd83ULRmKTrdvtrYxMLbpcTHt9C++WWnsfg1/KEqRdg4xR0u eUFBWSWtvAZliYHpAUR2CrbJYuapQ8nsq5xowd4MmsTnLZ5j6c+9mJIbjui5i8Vbtnha kr+17zLU2cmktRLAKPShofi0S1stdz7K0CtjigyNwIS3j7r2gsR6QQeElWppx7s8UsJv 0uNZLLs8yFnAKR9fAajicrKaj39D4sNF9irgLTpOp4DMcqSneuwzZHT3IsrW9vymIt1j wiAe3fXewDfUYRoQ1LVRc9cBeg1dtO6LUaOI7aH6zASVoC1XbRIn3qjPfcnOoqM8DXa2 Fl0w== X-Gm-Message-State: APjAAAV/GRj8z8ZPmFvxyZodad6kB9IWvsrmaHMhhxbGVTDjto9v/ms+ aEjN93rFEDQ80RCpGZEJBVaRrzx++T4= X-Google-Smtp-Source: APXvYqyMtC6YariCxSN1RZormnVexElY+W2u3UmUKdx2ZH8kHXp5ZxcRPBSqoa6GOf0F6zOs536i5Q== X-Received: by 2002:a2e:82cd:: with SMTP id n13mr7507423ljh.156.1570742701283; Thu, 10 Oct 2019 14:25:01 -0700 (PDT) Received: from localhost (128-72-185-159.broadband.corbina.ru. [128.72.185.159]) by smtp.gmail.com with ESMTPSA id 6sm1587053lfa.24.2019.10.10.14.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 14:25:00 -0700 (PDT) From: Mikhail Rudenko To: linux-trace-devel@vger.kernel.org Cc: Steven Rostedt , "Yordan Karadzhov (VMware)" , Mikhail Rudenko Subject: [PATCH 4/4] kernel-shark: Change KsDualMarker's inactive button style to default Date: Fri, 11 Oct 2019 00:24:29 +0300 Message-Id: <20191010212429.469155-5-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010212429.469155-1-mike.rudenko@gmail.com> References: <20191010212429.469155-1-mike.rudenko@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org At present, the style of an "inactive" KsDualMarker toolbar button is set to "system default background + rgb(70,70,70) text color". As a result, on dark qt color schemes (e.g. Breeze Dark) inactive button looks disabled ("gray on gray"). This patch addresses the issue by changing "inactive" button style to system default. This makes the UI intuitive across different color schemes. QStateMachine::setGlobalRestorePolicy is used for reducing the boilerplate of manually resetting button style when it becomes "inactive". Signed-off-by: Mikhail Rudenko --- kernel-shark/src/KsDualMarker.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) -- 2.23.0 diff --git a/kernel-shark/src/KsDualMarker.cpp b/kernel-shark/src/KsDualMarker.cpp index 0070777..90c5373 100644 --- a/kernel-shark/src/KsDualMarker.cpp +++ b/kernel-shark/src/KsDualMarker.cpp @@ -171,20 +171,12 @@ KsDualMarkerSM::KsDualMarkerSM(QWidget *parent) "styleSheet", styleSheetA); - _stateA->assignProperty(&_buttonB, - "styleSheet", - "color : rgb(70, 70, 70)"); - styleSheetB = "background : " + _markB._color.name() + "; color : white"; _stateB = new QState; _stateB->setObjectName("B"); - _stateB->assignProperty(&_buttonA, - "styleSheet", - "color : rgb(70, 70, 70)"); - _stateB->assignProperty(&_buttonB, "styleSheet", styleSheetB); @@ -223,6 +215,7 @@ KsDualMarkerSM::KsDualMarkerSM(QWidget *parent) connect(&_buttonA, &KsMarkerButton::deselect, this, &KsDualMarkerSM::deselectA); + _machine.setGlobalRestorePolicy(QState::RestoreProperties); _machine.addState(_stateA); _machine.addState(_stateB); _machine.setInitialState(_stateA);