[gnome-weather/wip/ewlsh/gtk4] Remove unnecessary frame.
- From: Evan Welsh <ewlsh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-weather/wip/ewlsh/gtk4] Remove unnecessary frame.
- Date: Wed, 6 Jan 2021 00:24:45 +0000 (UTC)
commit 77a6dd2cc807fd9cf0d724f7b6fb2f2e8d9130cf
Author: Evan Welsh <contact evanwelsh com>
Date: Tue Jan 5 16:24:39 2021 -0800
Remove unnecessary frame.
data/application.css | 7 -------
data/weather-widget.ui | 8 ++------
src/app/city.js | 5 ++---
3 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/data/application.css b/data/application.css
index f301f7a..8b57dab 100644
--- a/data/application.css
+++ b/data/application.css
@@ -21,13 +21,6 @@
font-size: 1.2em;
}
-#weather-page-content-view {
- background-size: cover;
- background-position: center;
- background-origin: border-box;
- background-clip: border-box;
-}
-
#loading-label {
padding-top: 24px;
font-size: 1.5em;
diff --git a/data/weather-widget.ui b/data/weather-widget.ui
index 531f265..f36df1f 100644
--- a/data/weather-widget.ui
+++ b/data/weather-widget.ui
@@ -5,11 +5,9 @@
<property name="layout_manager">
<object class="GtkBinLayout"/>
</property>
- <child>
- <object class="GtkFrame" id="contentFrame">
- <property name="name">weather-page-content-view</property>
+
<child>
- <object class="GtkGrid" id="outerGrid">
+ <object class="GtkGrid" id="contentGrid">
<property name="vexpand">True</property>
<child>
<object class="GtkOverlay" id="forecast-overlay">
@@ -201,7 +199,5 @@
</child>
</object>
</child>
- </object>
- </child>
</template>
</interface>
diff --git a/src/app/city.js b/src/app/city.js
index d253562..223bdc7 100644
--- a/src/app/city.js
+++ b/src/app/city.js
@@ -36,8 +36,7 @@ const UPDATED_TIME_TIMEOUT = 60; //s
var WeatherWidget = GObject.registerClass({
Template: 'resource:///org/gnome/Weather/weather-widget.ui',
- InternalChildren: ['contentFrame', 'outerGrid',
- 'conditionsImage', 'placesButton',
+ InternalChildren: ['contentGrid', 'conditionsImage', 'placesButton',
'temperatureLabel', 'apparentLabel',
'forecastStack','leftButton', 'rightButton',
'forecast-hourly', 'forecast-hourly-viewport',
@@ -119,7 +118,7 @@ var WeatherWidget = GObject.registerClass({
}
_cleanup() {
- this._contentFrame.unparent();
+ this._contentGrid.unparent();
this._worldView._cleanup();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]