From 313622965647782dd07cfbae97a8b2a22bcbbc3d Mon Sep 17 00:00:00 2001 From: xianxing Date: Thu, 15 Aug 2024 08:24:14 +0800 Subject: [PATCH] [feat] support gnome 46 --- .github/workflows/release-drafter.yml | 1 + metadata.json | 2 +- package.sh | 26 +++++++------------------- src/AppTab.js | 2 +- src/TabPanel.js | 2 +- 5 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index aff8f7f..a507416 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -6,6 +6,7 @@ on: branches: - test* - release* + - main permissions: contents: read diff --git a/metadata.json b/metadata.json index 1acb8de..9ea710d 100644 --- a/metadata.json +++ b/metadata.json @@ -4,5 +4,5 @@ "url": "https://github.com/hhoao/app_tabs", "uuid": "huanghaohhoa@163.com", "settings-schema": "org.gnome.shell.extensions.app_tabs", - "shell-version": ["45"] + "shell-version": ["45", "46"] } diff --git a/package.sh b/package.sh index 84a9199..e4ecaae 100644 --- a/package.sh +++ b/package.sh @@ -1,27 +1,15 @@ #!/bin/bash -include_files=( -src -stylesheet.css -extension.js -metadata.json -prefs.js -LICENSE -schemas +ignore_files=( +'.git/*' +'.idea/*' +'./.gitignore' +'.github/*' ) -args="" -for include_file in "${include_files[@]}"; do - if [ -e "$include_file" ]; then - args="${args} ${include_file}" - fi -done - -if [[ -n $1 ]]; then +if [ ! -z $1 ]; then package_name=$1 else package_name=$(date +'%Y%m%d%H%M%S') fi -args="-r ${package_name}.zip ${args}" - -zip ${args} +zip -x "${ignore_files[@]}" -r "${package_name}".zip . diff --git a/src/AppTab.js b/src/AppTab.js index 97766e1..6f0eccc 100644 --- a/src/AppTab.js +++ b/src/AppTab.js @@ -110,7 +110,7 @@ export const AppTab = GObject.registerClass({ y_expand: false, }); this._controls.add_style_class_name('app-tab-controller'); - this.add_actor(this._controls); + this.add_child(this._controls); } _init_icon() { diff --git a/src/TabPanel.js b/src/TabPanel.js index 7311bda..f5b8db8 100644 --- a/src/TabPanel.js +++ b/src/TabPanel.js @@ -28,7 +28,7 @@ export const TabPanel = GObject.registerClass({ this._scroll_view = this.get_horizontal_scroll_view(); this.set_panel_max_width(this._settings.get_int(SchemaKeyConstants.PANEL_MAX_WIDTH)); this._controls = new St.BoxLayout({style_class: 'app-tabs-box'}) - this._scroll_view.add_actor(this._controls); + this._scroll_view.add_child(this._controls); this.add_child(this._scroll_view) this._init_pool_tabs();